citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Connection pool cleanup

Browse Source 
- minor code quality improvement
This commit is contained in:
Peter Šurda 2017-06-24 12:23:16 +02:00
parent 0dc0b22974
commit 916b85c862
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/connectionpool.py
View File

@ -69,7 +69,7 @@ class BMConnectionPool(object):
def removeConnection(self, connection): def removeConnection(self, connection):
if isinstance(connection, network.udp.UDPSocket): if isinstance(connection, network.udp.UDPSocket):
del self.udpSockets[connection.listening.host] del self.udpSockets[connection.listening.host]
if isinstance(connection, network.tcp.TCPServer): elif isinstance(connection, network.tcp.TCPServer):
del self.listeningSockets[state.Peer(connection.destination.host, connection.destination.port)] del self.listeningSockets[state.Peer(connection.destination.host, connection.destination.port)]
elif connection.isOutbound: elif connection.isOutbound:
try: try:
@ -163,21 +163,23 @@ class BMConnectionPool(object):
self.lastSpawned = time.time() self.lastSpawned = time.time()
if acceptConnections and len(self.listeningSockets) == 0: if acceptConnections:
if not self.listeningSockets:
self.startListening() self.startListening()
logger.info('Listening for incoming connections.') logger.info('Listening for incoming connections.')
if acceptConnections and len(self.udpSockets) == 0: if not self.udpSockets:
if BMConfigParser().safeGet("network", "bind") is None: if BMConfigParser().safeGet("network", "bind") is None:
self.startUDPSocket() self.startUDPSocket()
else: else:
for bind in re.sub("[^\w.]+", " ", BMConfigParser().safeGet("network", "bind")).split(): for bind in re.sub("[^\w.]+", " ", BMConfigParser().safeGet("network", "bind")).split():
self.startUDPSocket(bind) self.startUDPSocket(bind)
logger.info('Starting UDP socket(s).') logger.info('Starting UDP socket(s).')
if len(self.listeningSockets) > 0 and not acceptConnections: else:
if self.listeningSockets:
for i in self.listeningSockets: for i in self.listeningSockets:
i.handle_close() i.handle_close()
logger.info('Stopped listening for incoming connections.') logger.info('Stopped listening for incoming connections.')
if len(self.udpSockets) > 0 and not acceptConnections: if self.udpSockets:
for i in self.udpSockets: for i in self.udpSockets:
i.handle_close() i.handle_close()
logger.info('Stopped udp sockets.') logger.info('Stopped udp sockets.')