Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Translation and other merge requests #224

Merged
Atheros1 merged 47 commits from master into master 2013-06-19 16:55:24 +02:00
Conversation 0 Commits 47 Files Changed 38 +9 -2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ae1ef0d50 - Show all commits

11
src/shared.py
View File

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