GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 11:39:25 +01:00
Code Issues Projects Releases Wiki Activity

relay: be more thread-safe via dict.copy()

Browse Source
This commit is contained in:
James Lu 2016-03-26 18:19:08 -07:00
parent 305db9f754
commit 4a0ee6f54c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/relay.py
View File

@ -582,7 +582,7 @@ def relayPart(irc, channel, user):
""" """
Relays a user part from a channel to its relay links, as part of a channel delink. Relays a user part from a channel to its relay links, as part of a channel delink.
""" """
for name, remoteirc in world.networkobjects.items(): for name, remoteirc in world.networkobjects.copy().items():
if name == irc.name or not remoteirc.connected.is_set(): if name == irc.name or not remoteirc.connected.is_set():
# Don't relay things to their source network... # Don't relay things to their source network...
continue continue
@ -849,7 +849,7 @@ def handle_messages(irc, numeric, command, args):
return return
if utils.isChannel(target): if utils.isChannel(target):
for name, remoteirc in world.networkobjects.items(): for name, remoteirc in world.networkobjects.copy().items():
real_target = getRemoteChan(irc, remoteirc, target) real_target = getRemoteChan(irc, remoteirc, target)
# Don't relay anything back to the source net, or to disconnected networks # Don't relay anything back to the source net, or to disconnected networks
@ -904,7 +904,7 @@ def handle_kick(irc, source, command, args):
if relay is None or target == irc.pseudoclient.uid: if relay is None or target == irc.pseudoclient.uid:
return return
origuser = getOrigUser(irc, target) origuser = getOrigUser(irc, target)
for name, remoteirc in world.networkobjects.items(): for name, remoteirc in world.networkobjects.copy().items():
if irc.name == name or not remoteirc.connected.is_set(): if irc.name == name or not remoteirc.connected.is_set():
continue continue
remotechan = getRemoteChan(irc, remoteirc, channel) remotechan = getRemoteChan(irc, remoteirc, channel)
@ -1008,7 +1008,7 @@ for c in ('CHGHOST', 'CHGNAME', 'CHGIDENT'):
def handle_mode(irc, numeric, command, args): def handle_mode(irc, numeric, command, args):
target = args['target'] target = args['target']
modes = args['modes'] modes = args['modes']
for name, remoteirc in world.networkobjects.items(): for name, remoteirc in world.networkobjects.copy().items():
if irc.name == name or not remoteirc.connected.is_set(): if irc.name == name or not remoteirc.connected.is_set():
continue continue
@ -1048,7 +1048,7 @@ def handle_topic(irc, numeric, command, args):
oldtopic = args.get('oldtopic') oldtopic = args.get('oldtopic')
topic = args['text'] topic = args['text']
if checkClaim(irc, channel, numeric): if checkClaim(irc, channel, numeric):
for name, remoteirc in world.networkobjects.items(): for name, remoteirc in world.networkobjects.copy().items():
if irc.name == name or not remoteirc.connected.is_set(): if irc.name == name or not remoteirc.connected.is_set():
continue continue
@ -1391,7 +1391,7 @@ def linked(irc, source, args):
Returns a list of channels shared across the relay.""" Returns a list of channels shared across the relay."""
# Only show remote networks that are marked as connected. # Only show remote networks that are marked as connected.
remote_networks = [netname for netname, ircobj in world.networkobjects.items() remote_networks = [netname for netname, ircobj in world.networkobjects.copy().items()
if ircobj.connected.is_set()] if ircobj.connected.is_set()]
# But remove the current network from the list, so that it isn't shown twice. # But remove the current network from the list, so that it isn't shown twice.