#786: updates to shutdown

Author: aschonfeld

dtale/app.py

@@ -423,8 +423,21 @@ 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 by searching gc for BaseWSGIServer"
+            )
+            import gc
+            from werkzeug.serving import BaseWSGIServer
+
+            for obj in gc.get_objects():
+                try:
+                    if isinstance(obj, BaseWSGIServer):
+                        obj.shutdown()
+                        break
+                except Exception as e:
+                    logger.error(e)
+        else:
+            func()
         global_state.cleanup()
         ACTIVE_PORT = None
         ACTIVE_HOST = None
@@ -830,6 +843,11 @@ def _start():
             if is_active:
                 _start()
             else:
+                # import multiprocessing
+                #
+                # p = multiprocessing.Process(target=_start, args=())
+                # p.start()
+
                 _thread.start_new_thread(_start, ())
 
             if final_options["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):

requirements.txt

@@ -23,6 +23,7 @@ Flask<2.3; python_version >= '3.7'
 Flask-Compress
 flask-ngrok; python_version > '3.0'
 future>=0.14.0
+immutables<=0.19; python_version == '3.6'
 itsdangerous<=1.1.0; python_version < '3.7'
 itsdangerous; python_version >= '3.7'
 # required for loading scikit-learn
@@ -45,7 +46,8 @@ matplotlib<=3.3.4; python_version == '3.4'
 matplotlib<=3.3.4; python_version == '3.5'
 matplotlib<=3.3.4; python_version == '3.6'
 matplotlib<=3.5.3; python_version == '3.7'
-matplotlib; python_version >= '3.8'
+matplotlib<=3.7.2; python_version == '3.8'
+matplotlib; python_version >= '3.9'
 missingno
 networkx<=2.2; python_version <= '3.4'
 networkx<=2.4; python_version == '3.5'

setup.py

@@ -83,7 +83,7 @@ def run_tests(self):
     install_requires=read_file("requirements.txt"),
     extras_require={
         "arctic": ["arctic <= 1.79.4"],
-        "arcticdb": ["arcticdb"],
+        "arcticdb": ["arcticdb != 1.6.1"],
         "dash-bio": [
             "ParmEd==3.4.3; python_version == '3.6'",
             "dash-bio; python_version > '3.0'",

tests/dtale/test_views.py

@@ -435,18 +435,33 @@ def import_mock(name, *args, **kwargs):
 
 @pytest.mark.unit
 def test_shutdown(unittest):
+    import werkzeug
+
     with app.test_client() as c:
         try:
-            c.get("/shutdown")
+            with ExitStack() as stack:
+                from werkzeug.serving import BaseWSGIServer
+
+                base_server = mock.Mock(spec=BaseWSGIServer)
+                base_server.shutdown = mock.Mock()
+                gc_objects = [base_server]
+                mock_gc = stack.enter_context(
+                    mock.patch("gc.get_objects", mock.Mock(return_value=gc_objects))
+                )
+                resp = c.get("/shutdown").data
+                assert "Server shutting down..." in str(resp)
+                mock_gc.assert_called()
+                base_server.shutdown.assert_called()
             unittest.fail()
         except:  # noqa
             pass
-        mock_shutdown = mock.Mock()
-        resp = c.get(
-            "/shutdown", environ_base={"werkzeug.server.shutdown": mock_shutdown}
-        ).data
-        assert "Server shutting down..." in str(resp)
-        mock_shutdown.assert_called()
+        if parse_version(werkzeug.__version__) < parse_version("2.1.0"):
+            mock_shutdown = mock.Mock()
+            resp = c.get(
+                "/shutdown", environ_base={"werkzeug.server.shutdown": mock_shutdown}
+            ).data
+            assert "Server shutting down..." in str(resp)
+            mock_shutdown.assert_called()
 
 
 @pytest.mark.unit