diff --git a/src/leap/soledad/server/app.py b/src/leap/soledad/server/app.py index 77d3a1cd9e62cebf506b6c7310d70877d3c20263..cad4f31b09332500b5e1d0d65fee913518ff5eeb 100644 --- a/src/leap/soledad/server/app.py +++ b/src/leap/soledad/server/app.py @@ -17,7 +17,6 @@ """ Soledad Server, as a Twisted Application. """ -import sys import os from twisted.application import service, strports @@ -34,9 +33,12 @@ logger = getLogger(__name__) def _exit(status): - reactor.addSystemEventTrigger( - 'after', 'shutdown', sys.exit, status) - reactor.stop() + if reactor.running: + reactor.addSystemEventTrigger( + 'after', 'shutdown', os._exit, status) + reactor.stop() + else: + os._exit(status) def _log_and_exit(failure):