Moved workaround code slightly.
This commit is contained in:
parent
2ae1ef0d50
commit
2762de52e2
|
@ -174,6 +174,11 @@ def doCleanShutdown():
|
||||||
print 'Finished flushing inventory.'
|
print 'Finished flushing inventory.'
|
||||||
printLock.release()
|
printLock.release()
|
||||||
|
|
||||||
|
#Messy hack to kill child processes immediately. May not work on all platforms.
|
||||||
|
try:
|
||||||
|
os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
|
||||||
|
except:
|
||||||
|
os.kill(os.getpid(), signal.SIGTERM)
|
||||||
|
|
||||||
if safeConfigGetBoolean('bitmessagesettings','daemon'):
|
if safeConfigGetBoolean('bitmessagesettings','daemon'):
|
||||||
printLock.acquire()
|
printLock.acquire()
|
||||||
|
@ -181,12 +186,6 @@ def doCleanShutdown():
|
||||||
printLock.release()
|
printLock.release()
|
||||||
os._exit(0)
|
os._exit(0)
|
||||||
|
|
||||||
#Messy hack to kill child processes immediately. May not work on all platforms.
|
|
||||||
try:
|
|
||||||
os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
|
|
||||||
except:
|
|
||||||
os.kill(os.getpid(), signal.SIGTERM)
|
|
||||||
|
|
||||||
#Wen you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
|
#Wen you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
|
||||||
def broadcastToSendDataQueues(data):
|
def broadcastToSendDataQueues(data):
|
||||||
#print 'running broadcastToSendDataQueues'
|
#print 'running broadcastToSendDataQueues'
|
||||||
|
|
Reference in New Issue
Block a user