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

relay: don't break autoconnect anymore when there's a server conflict

Browse Source 
This reverts most of commits 5c7524b and f2a5e1d.
This commit is contained in:
James Lu 2016-11-07 21:52:17 -08:00
parent 4246a3d113
commit 44743d860e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/relay.py
View File

@ -7,7 +7,6 @@ from collections import defaultdict
from pylinkirc import utils, world, conf from pylinkirc import utils, world, conf
from pylinkirc.log import log from pylinkirc.log import log
from pylinkirc.coremods import control
from pylinkirc.coremods import permissions from pylinkirc.coremods import permissions
### GLOBAL (statekeeping) VARIABLES ### GLOBAL (statekeeping) VARIABLES
@ -274,10 +273,7 @@ def spawnRelayServer(irc, remoteirc):
log.exception('(%s) Failed to spawn server for %r (possible jupe?):', log.exception('(%s) Failed to spawn server for %r (possible jupe?):',
irc.name, remoteirc.name) irc.name, remoteirc.name)
# We will just bail here. Disconnect the bad network. # We will just bail here. Disconnect the bad network.
try: irc.disconnect()
control.remove_network(irc)
except KeyError:
pass
return return
# Mark the server as a relay server # Mark the server as a relay server