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

relay: silently abort if a network splits while we try to spawn a server or client

Browse Source
This commit is contained in:
James Lu 2018-03-11 21:25:42 -07:00
parent 5733418380
commit b7b49769e0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/relay.py
View File

@ -281,14 +281,9 @@ def get_relay_server_sid(irc, remoteirc, spawn_if_missing=True):
sid = spawn_relay_server(irc, remoteirc) sid = spawn_relay_server(irc, remoteirc)
log.debug('(%s) get_relay_server_sid: got %s for %s.relay', irc.name, sid, remoteirc.name) log.debug('(%s) get_relay_server_sid: got %s for %s.relay', irc.name, sid, remoteirc.name)
if sid not in irc.servers: if (sid not in irc.servers) or (sid in irc.servers and irc.servers[sid].remote != remoteirc.name):
log.warning('(%s) Possible desync? SID %s for %s.relay doesn\'t exist anymore', irc.name, sid, remoteirc.name) # SID changed in the meantime; abort.
# Our stored server doesn't exist anymore. This state is probably a holdover from a netsplit, return
# so let's refresh it.
sid = spawn_relay_server(irc, remoteirc)
elif sid in irc.servers and irc.servers[sid].remote != remoteirc.name:
log.debug('(%s) Possible desync? SID %s for %s.relay doesn\'t exist anymore is mismatched (got %s.relay)', irc.name, irc.servers[sid].remote, remoteirc.name)
sid = spawn_relay_server(irc, remoteirc)
log.debug('(%s) get_relay_server_sid: got %s for %s.relay (round 2)', irc.name, sid, remoteirc.name) log.debug('(%s) get_relay_server_sid: got %s for %s.relay (round 2)', irc.name, sid, remoteirc.name)
spawnlocks_servers[irc.name].release() spawnlocks_servers[irc.name].release()
@ -336,7 +331,7 @@ def spawn_relay_user(irc, remoteirc, user, times_tagged=0):
rsid = get_relay_server_sid(remoteirc, irc) rsid = get_relay_server_sid(remoteirc, irc)
if not rsid: if not rsid:
log.error('(%s) spawn_relay_user: aborting user spawn for %s/%s @ %s (failed to retrieve a ' log.debug('(%s) spawn_relay_user: aborting user spawn for %s/%s @ %s (failed to retrieve a '
'working SID).', irc.name, user, nick, remoteirc.name) 'working SID).', irc.name, user, nick, remoteirc.name)
return return
try: try: