From afd9c3a93e7314533cb8ab096ce68755beda809a Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Mon, 8 May 2017 23:03:55 +1000 Subject: [PATCH] pybind/mgr/rest: completely terminate cherrypy in shutdown cherrypy.engine.stop() doesn't actually completely kill cherrypy, which means cherrypy.engine.block() never returns, so this module's thread never completes cleanly. Signed-off-by: Tim Serong --- src/pybind/mgr/rest/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/rest/module.py b/src/pybind/mgr/rest/module.py index f72b7ce30e4..77a38f54d6e 100644 --- a/src/pybind/mgr/rest/module.py +++ b/src/pybind/mgr/rest/module.py @@ -156,7 +156,7 @@ class Module(MgrModule): return [self._auth_cls()] def shutdown(self): - cherrypy.engine.stop() + cherrypy.engine.exit() def serve(self): self.keys = self._load_keys() -- 2.39.5