src/shared.py

@@ -7,6 +7,7 @@ import highlevelcrypto
 import Queue
 import pickle
 import os
+import signal
 
 myECCryptorObjects = {}
 MyECSubscriptionCryptorObjects = {}
@@ -173,12 +174,18 @@ def doCleanShutdown():
     print 'Finished flushing inventory.'
     printLock.release()
     
-
+    
     if safeConfigGetBoolean('bitmessagesettings','daemon'):
         printLock.acquire()
         print 'Done.'
         printLock.release()
         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.
 def broadcastToSendDataQueues(data):
@@ -197,4 +204,4 @@ def flushInventory():
         sqlReturnQueue.get()
         del inventory[hash]
     sqlSubmitQueue.put('commit')
-    sqlLock.release()
+    sqlLock.release()