#786: updates to shutdown

Author: aschonfeld

dtale/app.py

@@ -50,11 +50,6 @@
 )
 from dtale.views import DtaleData, head_endpoint, is_up, kill, startup
 
-if PY3:
-    import _thread
-else:
-    import thread as _thread
-
 logger = logging.getLogger(__name__)
 
 USE_NGROK = False
@@ -423,8 +418,12 @@ def shutdown_server():
         logger.info("Executing shutdown...")
         func = request.environ.get("werkzeug.server.shutdown")
         if func is None:
-            raise RuntimeError("Not running with the Werkzeug Server")
-        func()
+            logger.info("Not running with the Werkzeug Server, exiting using os._exit")
+            import os
+
+            os._exit(os.EX_OK)
+        else:
+            func()
         global_state.cleanup()
         ACTIVE_PORT = None
         ACTIVE_HOST = None
@@ -830,7 +829,10 @@ def _start():
             if is_active:
                 _start()
             else:
-                _thread.start_new_thread(_start, ())
+                import multiprocessing
+
+                p = multiprocessing.Process(target=_start, args=())
+                p.start()
 
             if final_options["notebook"]:
                 instance.notebook()

dtale/views.py

@@ -192,7 +192,10 @@ def kill(base):
     This function fires a request to this instance's 'shutdown' route to kill it
 
     """
-    requests.get(build_shutdown_url(base))
+    try:
+        requests.get(build_shutdown_url(base))
+    except BaseException:
+        logger.info("Shutdown complete")
 
 
 def is_up(base):

tests/dtale/test_app.py

@@ -320,7 +320,7 @@ def run(self, *args, **kwargs):
             ignore_duplicate=True,
         )
 
-    with mock.patch("dtale.app._thread.start_new_thread", mock.Mock()) as mock_thread:
+    with mock.patch("multiprocessing.Process", mock.Mock()) as mock_thread:
         show(data=test_data, subprocess=True, ignore_duplicate=True)
         mock_thread.assert_called()
 

tests/dtale/test_views.py

@@ -435,7 +435,16 @@ def import_mock(name, *args, **kwargs):
 
 @pytest.mark.unit
 def test_shutdown(unittest):
+    import werkzeug
+
     with app.test_client() as c:
+        if parse_version(werkzeug.__version__) >= parse_version("2.1.0"):
+            with ExitStack() as stack:
+                mock_os = stack.enter_context(mock.patch("os._exit", mock.Mock()))
+                resp = c.get("/shutdown").data
+                assert "Server shutting down..." in str(resp)
+                mock_os.assert_called()
+                return
         try:
             c.get("/shutdown")
             unittest.fail()