Properly handle SIGTERM if daemon ran with -d #1060

Merged
g1itch merged 3 commits from daemon into v0.6 2018-01-25 03:11:18 +01:00
Showing only changes of commit 1b921a718c - Show all commits

View File

@ -6,7 +6,7 @@ from multiprocessing import current_process
from threading import current_thread, enumerate from threading import current_thread, enumerate
import traceback import traceback
from bmconfigparser import BMConfigParser import shared
from debug import logger from debug import logger
import queues import queues
import shutdown import shutdown
@ -54,7 +54,7 @@ def signal_handler(signal, frame):
if current_thread().name not in ("PyBitmessage", "MainThread"): if current_thread().name not in ("PyBitmessage", "MainThread"):
return return
logger.error("Got signal %i", signal) logger.error("Got signal %i", signal)
if BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon'): if shared.thisapp.daemon:
shutdown.doCleanShutdown() shutdown.doCleanShutdown()
else: else:
allThreadTraceback(frame) allThreadTraceback(frame)