GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-21 16:00:57 +01:00
Code Issues Projects Releases Wiki Activity

relay: bandaid patch for freezes on startup when there are a ton of networks

Browse Source 
The side effect of this patch is that it makes large bursts *really* CPU intensive. A proper fix for this will hopefully be introduced in the future.
This commit is contained in:
James Lu 2018-03-11 21:26:37 -07:00
parent b7b49769e0
commit 5bffe67416
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/relay.py
View File

@ -33,10 +33,7 @@ default_permissions = {"*!*@*": ['relay.linked'],
def initialize_all(irc): def initialize_all(irc):
"""Initializes all relay channels for the given IRC object.""" """Initializes all relay channels for the given IRC object."""
# Wait for all IRC objects to be created first. This prevents def _initialize_all():
# relay servers from being spawned too early (before server authentication),
# which would break connections.
if world.started.wait(TCONDITION_TIMEOUT):
for chanpair, entrydata in db.items(): for chanpair, entrydata in db.items():
network, channel = chanpair network, channel = chanpair
@ -48,6 +45,14 @@ def initialize_all(irc):
if network == irc.name: if network == irc.name:
initialize_channel(irc, channel) initialize_channel(irc, channel)
# Wait for all IRC objects to be created first. This prevents
# relay servers from being spawned too early (before server authentication),
# which would break connections.
if world.started.wait(TCONDITION_TIMEOUT):
t = threading.Thread(target=_initialize_all, daemon=True,
name='relay initialize_all thread from network %r' % irc.name)
t.start()
def main(irc=None): def main(irc=None):
"""Main function, called during plugin loading at start.""" """Main function, called during plugin loading at start."""
log.debug('relay.main: loading links database') log.debug('relay.main: loading links database')
@ -500,9 +505,8 @@ def initialize_channel(irc, channel):
# from the config. Skip this. # from the config. Skip this.
continue continue
# Give each network a tiny bit of leeway to finish up its connection. # Remote net isn't ready yet, try again later.
# This is better than just dropping users their completely. if not remoteirc.connected.is_set():
if not remoteirc.connected.wait(TCONDITION_TIMEOUT):
continue continue
# Join their (remote) users and set their modes, if applicable. # Join their (remote) users and set their modes, if applicable.