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

relay: replace garbage locking code with proper filtering in relay_joins

Browse Source 
I'm not even going to start on how much time I spent working on this...

Closes #548, #529
This commit is contained in:
James Lu 2017-11-12 11:56:33 -08:00
parent d4cbf1d2af
commit 03e02dda51
1 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
plugins/relay.py
View File

@ -473,54 +473,59 @@ def initialize_channel(irc, channel):
# We're initializing a relay that already exists. This can be done at # We're initializing a relay that already exists. This can be done at
# ENDBURST, or on the LINK command. # ENDBURST, or on the LINK command.
relay = get_relay(irc, channel) relay = get_relay(irc, channel)
log.debug('(%s) relay.initialize_channel being called on %s', irc.name, channel) log.debug('(%s) relay.initialize_channel being called on %s', irc.name, channel)
log.debug('(%s) relay.initialize_channel: relay pair found to be %s', irc.name, relay) log.debug('(%s) relay.initialize_channel: relay pair found to be %s', irc.name, relay)
queued_users = [] queued_users = []
if relay: if relay:
# Only allow one thread to initialize channels at a time. all_links = db[relay]['links'].copy()
if relay in channels_init_in_progress and channels_init_in_progress[relay].is_set(): all_links.update((relay,))
log.debug('(%s) relay.initialize_channel: skipping init of %s since another one is in progress', irc.name, relay) log.debug('(%s) relay.initialize_channel: all_links: %s', irc.name, all_links)
return
channels_init_in_progress[relay].set() # Iterate over all the remote channels linked in this relay.
try: for link in all_links:
all_links = db[relay]['links'].copy() remotenet, remotechan = link
all_links.update((relay,)) if remotenet == irc.name: # If the network is us, skip.
log.debug('(%s) relay.initialize_channel: all_links: %s', irc.name, all_links) continue
remoteirc = world.networkobjects.get(remotenet)
# Iterate over all the remote channels linked in this relay. if remoteirc is None:
for link in all_links: # Remote network doesn't have an IRC object; e.g. it was removed
remotenet, remotechan = link # from the config. Skip this.
if remotenet == irc.name: # If the network is us, skip. continue
# Give each network a tiny bit of leeway to finish up its connection.
# This is better than just dropping users their completely.
if not remoteirc.connected.wait(TCONDITION_TIMEOUT):
continue
# Join their (remote) users and set their modes, if applicable.
if remotechan in remoteirc.channels:
rc = remoteirc.channels[remotechan]
'''
if not hasattr(rc, '_relay_initial_burst'):
rc._relay_initial_burst = threading.Event()
if rc._relay_initial_burst.is_set():
log.debug('(%s) relay.initialize_channel: skipping inbound burst from %s/%s => %s/%s '
'as it has already been bursted', irc.name, remoteirc.name, remotechan, irc.name, channel)
continue continue
remoteirc = world.networkobjects.get(remotenet) rc._relay_initial_burst.set()
'''
relay_joins(remoteirc, remotechan, rc.users, rc.ts, targetirc=irc)
if remoteirc is None: # Only update the topic if it's different from what we already have,
# Remote network doesn't have an IRC object; e.g. it was removed # and topic bursting is complete.
# from the config. Skip this. if rc.topicset and rc.topic != irc.channels[channel].topic:
continue irc.topic_burst(irc.sid, channel, rc.topic)
if not (remoteirc.connected.is_set() and get_remote_channel(remoteirc, irc, remotechan)): # Send our users and channel modes to the other nets
continue # Remote network isn't connected. if channel in irc.channels:
c = irc._channels[channel]
relay_joins(irc, channel, c.users, c.ts)
# Join their (remote) users and set their modes, if applicable. if 'pylink' in world.services:
if remotechan in remoteirc.channels: world.services['pylink'].join(irc, channel)
rc = remoteirc.channels[remotechan]
relay_joins(remoteirc, remotechan, rc.users, rc.ts)
# Only update the topic if it's different from what we already have,
# and topic bursting is complete.
if rc.topicset and rc.topic != irc.channels[channel].topic:
irc.topic_burst(irc.sid, channel, rc.topic)
# Send our users and channel modes to the other nets
if channel in irc.channels:
relay_joins(irc, channel, irc.channels[channel].users, irc.channels[channel].ts)
if 'pylink' in world.services:
world.services['pylink'].join(irc, channel)
finally:
channels_init_in_progress[relay].clear()
def remove_channel(irc, channel): def remove_channel(irc, channel):
"""Destroys a relay channel by parting all of its users.""" """Destroys a relay channel by parting all of its users."""
@ -673,9 +678,10 @@ def iterate_all_present(origirc, origuser, func, extra_args=(), kwargs=None):
### EVENT HANDLER INTERNALS ### EVENT HANDLER INTERNALS
def relay_joins(irc, channel, users, ts, **kwargs): def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
""" """
Relays one or more users' joins from a channel to its relay links. Relays one or more users' joins from a channel to its relay links. If targetirc is given, only burst
to that specific network.
""" """
if ts < 750000: if ts < 750000:
@ -740,7 +746,10 @@ def relay_joins(irc, channel, users, ts, **kwargs):
remoteirc.call_hooks([rsid, 'PYLINK_RELAY_JOIN', {'channel': remotechan, 'users': [u[-1] for u in queued_users]}]) remoteirc.call_hooks([rsid, 'PYLINK_RELAY_JOIN', {'channel': remotechan, 'users': [u[-1] for u in queued_users]}])
iterate_all(irc, _relay_joins_loop, extra_args=(channel, users, ts), kwargs=kwargs) if targetirc:
_relay_joins_loop(irc, targetirc, channel, users, ts, **kwargs)
else:
iterate_all(irc, _relay_joins_loop, extra_args=(channel, users, ts), kwargs=kwargs)
def relay_part(irc, *args, **kwargs): def relay_part(irc, *args, **kwargs):
""" """