Moved Multiqueue, invQueue and addrQueue to network module #2256
|
@ -9,6 +9,7 @@ dandelion_ins = Dandelion()
|
|||
|
||||
# network queues
|
||||
invQueue = MultiQueue()
|
||||
addrQueue = MultiQueue()
|
||||
|
||||
__all__ = ["StoppableThread"]
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ from six.moves import queue
|
|||
# magic imports!
|
||||
import connectionpool
|
||||
from protocol import assembleAddrMessage
|
||||
from queues import addrQueue # FIXME: init with queue
|
||||
from network import addrQueue # FIXME: init with queue
|
||||
|
||||
|
||||
from threads import StoppableThread
|
||||
|
||||
|
|
|
@ -6,10 +6,6 @@ import time
|
|||
from six.moves import queue
|
||||
|
||||
|
||||
from network.multiqueue import MultiQueue
|
||||
|
||||
|
||||
|
||||
class ObjectProcessorQueue(queue.Queue):
|
||||
"""Special queue class using lock for `.threads.objectProcessor`"""
|
||||
|
||||
|
@ -43,7 +39,6 @@ addressGeneratorQueue = queue.Queue()
|
|||
#: `.network.ReceiveQueueThread` instances dump objects they hear
|
||||
#: on the network into this queue to be processed.
|
||||
objectProcessorQueue = ObjectProcessorQueue()
|
||||
addrQueue = MultiQueue()
|
||||
portCheckerQueue = queue.Queue()
|
||||
receiveDataQueue = queue.Queue()
|
||||
#: The address generator thread uses this queue to get information back
|
||||
|
|
Reference in New Issue
Block a user
Please check Fixme comment, i'm not sure whether i remove this comment or not.
I'm not sure either, let's leave it as it is.