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

preparation for switch from 32 bit time to 64 bit time in protocol #128

Merged
Atheros1 merged 6 commits from master into master 2013-04-17 21:32:05 +02:00
Conversation 0 Commits 6 Files Changed 1 +11 -9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3976c5a8d2 - Show all commits

20
bitmessagemain.py
View File

@ -439,7 +439,7 @@ class receiveDataThread(QThread):
printLock.release() printLock.release()
self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST, remoteNodeIncomingPort)]) #This lets all of our peers know about this new node. self.broadcastaddr([(int(time.time()), self.streamNumber, 1, self.HOST, remoteNodeIncomingPort)]) #This lets all of our peers know about this new node.
self.sendaddr() #This is one large addr message to this one peer. self.sendaddr() #This is one large addr message to this one peer.
if connectionsCount[self.streamNumber] > 150: if not self.initiatedConnection and connectionsCount[self.streamNumber] > 150:
printLock.acquire() printLock.acquire()
print 'We are connected to too many people. Closing connection.' print 'We are connected to too many people. Closing connection.'
printLock.release() printLock.release()
@ -4592,6 +4592,14 @@ class MyForm(QtGui.QMainWindow):
else: else:
event.ignore()''' event.ignore()'''
self.statusBar().showMessage('Bitmessage is stuck waiting for the knownNodesLock.')
knownNodesLock.acquire()
self.statusBar().showMessage('Saving the knownNodes list of peers to disk...')
output = open(appdata + 'knownnodes.dat', 'wb')
pickle.dump(knownNodes, output)
output.close()
knownNodesLock.release()
broadcastToSendDataQueues((0, 'shutdown', 'all')) broadcastToSendDataQueues((0, 'shutdown', 'all'))
printLock.acquire() printLock.acquire()
@ -4607,13 +4615,6 @@ class MyForm(QtGui.QMainWindow):
sqlReturnQueue.get() sqlReturnQueue.get()
sqlLock.release() sqlLock.release()
self.statusBar().showMessage('Saving the knownNodes list of peers to disk...')
knownNodesLock.acquire()
output = open(appdata + 'knownnodes.dat', 'wb')
pickle.dump(knownNodes, output)
output.close()
knownNodesLock.release()
self.trayIcon.hide() self.trayIcon.hide()
printLock.acquire() printLock.acquire()
print 'Done.' print 'Done.'
@ -4621,7 +4622,8 @@ class MyForm(QtGui.QMainWindow):
self.statusBar().showMessage('All done. Closing user interface...') self.statusBar().showMessage('All done. Closing user interface...')
event.accept() event.accept()
print 'done. (passed event.accept())' print 'done. (passed event.accept())'
raise SystemExit #raise SystemExit
os._exit(0)
def on_action_InboxMessageForceHtml(self): def on_action_InboxMessageForceHtml(self):
currentInboxRow = self.ui.tableWidgetInbox.currentRow() currentInboxRow = self.ui.tableWidgetInbox.currentRow()