]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: fix os._exit overrides
authorJohn Spray <john.spray@redhat.com>
Wed, 4 Oct 2017 17:13:25 +0000 (13:13 -0400)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 12:20:21 +0000 (08:20 -0400)
These would throw an exception when passed
a status code.

Signed-off-by: John Spray <john.spray@redhat.com>
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/prometheus/module.py

index c5f362a3b6fb1360dd977e47196d4ebd1b9ae08a..978973725183f79ac9a571550e49f171f254590d 100644 (file)
@@ -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
index c086eaadf29896acacab649ab6f6fa85d3a8a97e..842517f208f37e7a101864d875b295263caec083 100644 (file)
@@ -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