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
52 lines
1.7 KiB
Python
52 lines
1.7 KiB
Python
import errno
|
|
import Queue
|
|
import socket
|
|
|
|
import state
|
|
from network.connectionpool import BMConnectionPool
|
|
from network.advanceddispatcher import UnknownStateError
|
|
from queues import receiveDataQueue
|
|
from threads import StoppableThread
|
|
|
|
|
|
class ReceiveQueueThread(StoppableThread):
|
|
def __init__(self, num=0):
|
|
super(ReceiveQueueThread, self).__init__(name="ReceiveQueue_%i" % num)
|
|
|
|
def run(self):
|
|
while not self._stopped and state.shutdown == 0:
|
|
try:
|
|
dest = receiveDataQueue.get(block=True, timeout=1)
|
|
except Queue.Empty:
|
|
continue
|
|
|
|
if self._stopped or state.shutdown:
|
|
break
|
|
|
|
# cycle as long as there is data
|
|
# methods should return False if there isn't enough data,
|
|
# or the connection is to be aborted
|
|
|
|
# state_* methods should return False if there isn't
|
|
# enough data, or the connection is to be aborted
|
|
|
|
try:
|
|
connection = BMConnectionPool().getConnectionByAddr(dest)
|
|
# KeyError = connection object not found
|
|
except KeyError:
|
|
receiveDataQueue.task_done()
|
|
continue
|
|
try:
|
|
connection.process()
|
|
# UnknownStateError = state isn't implemented
|
|
except UnknownStateError:
|
|
pass
|
|
except socket.error as err:
|
|
if err.errno == errno.EBADF:
|
|
connection.set_state("close", 0)
|
|
else:
|
|
self.logger.error('Socket error: %s', err)
|
|
except:
|
|
self.logger.error('Error processing', exc_info=True)
|
|
receiveDataQueue.task_done()
|