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
42 lines
1.3 KiB
Python
42 lines
1.3 KiB
Python
"""
|
|
src/network/announcethread.py
|
|
=================================
|
|
"""
|
|
|
|
import time
|
|
|
|
import state
|
|
from bmconfigparser import BMConfigParser
|
|
from network.bmproto import BMProto
|
|
from network.connectionpool import BMConnectionPool
|
|
from network.udp import UDPSocket
|
|
from threads import StoppableThread
|
|
|
|
|
|
class AnnounceThread(StoppableThread):
|
|
"""A thread to manage regular announcing of this node"""
|
|
name = "Announcer"
|
|
|
|
def run(self):
|
|
lastSelfAnnounced = 0
|
|
while not self._stopped and state.shutdown == 0:
|
|
processed = 0
|
|
if lastSelfAnnounced < time.time() - UDPSocket.announceInterval:
|
|
self.announceSelf()
|
|
lastSelfAnnounced = time.time()
|
|
if processed == 0:
|
|
self.stop.wait(10)
|
|
|
|
@staticmethod
|
|
def announceSelf():
|
|
"""Announce our presence"""
|
|
for connection in BMConnectionPool().udpSockets.values():
|
|
if not connection.announcing:
|
|
continue
|
|
for stream in state.streamsInWhichIAmParticipating:
|
|
addr = (
|
|
stream,
|
|
state.Peer('127.0.0.1', BMConfigParser().safeGetInt("bitmessagesettings", "port")),
|
|
time.time())
|
|
connection.append_write_buf(BMProto.assembleAddr([addr]))
|