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 <tserong@suse.com>

diff --git a/src/pybind/mgr/rest/module.py b/src/pybind/mgr/rest/module.py
index f72b7ce30e4bab445e588712349a6147db7fa79d..77a38f54d6e0fa37376451554a01f404af1c35a2 100644 (file)
--- 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()