Dmitri Bogomolov
7a89109fc9
and use logging without risk of circular import. Only subpackage
that imports from debug is bitmessageqt - because it also uses
debug.resetLogging().
Instead of from debug import logger is now recommended to use:
import logging
logger = logging.getLogger('default')
All subclasses of StoppableThread now have a logger attribute.
All threading related stuff except for set_thread_name()
was moved from helper_threading to network.threads.
Fixed two my mistakes from previous edit of debug in a1a8d3a:
- logger.handlers is not dict but iterable
- sys.excepthook should be set unconditionally
40 lines
1.1 KiB
Python
40 lines
1.1 KiB
Python
import network.asyncore_pollchoose as asyncore
|
|
import state
|
|
from network.connectionpool import BMConnectionPool
|
|
from queues import excQueue
|
|
from threads import StoppableThread
|
|
|
|
|
|
class BMNetworkThread(StoppableThread):
|
|
"""A thread to handle network concerns"""
|
|
name = "Asyncore"
|
|
|
|
def run(self):
|
|
try:
|
|
while not self._stopped and state.shutdown == 0:
|
|
BMConnectionPool().loop()
|
|
except Exception as e:
|
|
excQueue.put((self.name, e))
|
|
raise
|
|
|
|
def stopThread(self):
|
|
super(BMNetworkThread, self).stopThread()
|
|
for i in BMConnectionPool().listeningSockets.values():
|
|
try:
|
|
i.close()
|
|
except:
|
|
pass
|
|
for i in BMConnectionPool().outboundConnections.values():
|
|
try:
|
|
i.close()
|
|
except:
|
|
pass
|
|
for i in BMConnectionPool().inboundConnections.values():
|
|
try:
|
|
i.close()
|
|
except:
|
|
pass
|
|
|
|
# just in case
|
|
asyncore.close_all()
|