mgr: fix os._exit overrides

These would throw an exception when passed
a status code.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit e2442c1e20bf4ff12d58af500b34a18cc60d2de1)

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 0cb92332837fc15b262643c7f08e297f20b7762a..526007e00f8d0f5cfc7a13508309f8f16b5728d8 100644 (file)
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -46,7 +46,7 @@ log = logging.getLogger("dashboard")
 LOG_BUFFER_SIZE = 30
 
 # cherrypy likes to sys.exit on error.  don't let it take us down too!
-def os_exit_noop():
+def os_exit_noop(*args, **kwargs):
     pass
 
 os._exit = os_exit_noop

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index c086eaadf29896acacab649ab6f6fa85d3a8a97e..842517f208f37e7a101864d875b295263caec083 100644 (file)
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -15,7 +15,7 @@ DEFAULT_PORT = 9283
 
 
 # cherrypy likes to sys.exit on error.  don't let it take us down too!
-def os_exit_noop():
+def os_exit_noop(*args, **kwargs):
     pass