From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Jun 2017 22:12:02 +0000 (-0400)
Subject: pybind/mgr/dashboard: monkeypatch os.exit to stop cherrypy from taking down mgr
X-Git-Tag: v12.1.0~193^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1c4a59db75b0b9874057a7ab96bd5507f70e683;p=ceph.git

pybind/mgr/dashboard: monkeypatch os.exit to stop cherrypy from taking down mgr

Fixes: http://tracker.ceph.com/issues/20216
Suggested-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 6e5c2347c8d..df0437da550 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -43,6 +43,12 @@ log = logging.getLogger("dashboard")
 # python module for the convenience of the GUI?
 LOG_BUFFER_SIZE = 30
 
+# cherrypy likes to sys.exit on error.  don't let it take us down too!
+def os_exit_noop():
+    pass
+
+os._exit = os_exit_noop
+
 
 def recurse_refs(root, path):
     if isinstance(root, dict):