From 5956b8e095966f91ea8d83956d0d7d46a447ddba Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Tue, 21 Nov 2017 19:06:19 -0200
Subject: [bug] use os._exit to ensure a clean log on startup failure

---
 src/leap/soledad/server/app.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/leap')

diff --git a/src/leap/soledad/server/app.py b/src/leap/soledad/server/app.py
index 77d3a1cd..cad4f31b 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):
-- 
cgit v1.2.3