Store msgid in sent table #307

Merged
Atheros1 merged 6 commits from master into master 2013-07-16 01:35:13 +02:00
Showing only changes of commit 27c0ac436c - Show all commits

View File

@ -21,9 +21,10 @@ class singleListener(threading.Thread):
self.selfInitiatedConnections = selfInitiatedConnections self.selfInitiatedConnections = selfInitiatedConnections
def run(self): def run(self):
# We don't want to accept incoming connections if the user is using a # We typically don't want to accept incoming connections if the user is using a
# SOCKS proxy. If they eventually select proxy 'none' then this will # SOCKS proxy, unless they have configured otherwise. If they eventually select
# start listening for connections. # proxy 'none' or configure SOCKS listening then this will start listening for
# connections.
while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and not shared.config.getboolean('bitmessagesettings', 'sockslisten'): while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and not shared.config.getboolean('bitmessagesettings', 'sockslisten'):
time.sleep(300) time.sleep(300)
@ -40,9 +41,10 @@ class singleListener(threading.Thread):
sock.listen(2) sock.listen(2)
while True: while True:
# We don't want to accept incoming connections if the user is using # We typically don't want to accept incoming connections if the user is using a
# a SOCKS proxy. If the user eventually select proxy 'none' then # SOCKS proxy, unless they have configured otherwise. If they eventually select
# this will start listening for connections. # proxy 'none' or configure SOCKS listening then this will start listening for
# connections.
while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and not shared.config.getboolean('bitmessagesettings', 'sockslisten'): while shared.config.get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and not shared.config.getboolean('bitmessagesettings', 'sockslisten'):
time.sleep(10) time.sleep(10)
while len(shared.connectedHostsList) > 220: while len(shared.connectedHostsList) > 220: