mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-23 19:19:31 +01:00
relay: don't break autoconnect anymore when there's a server conflict
This reverts most of commits5c7524b
andf2a5e1d
.
This commit is contained in:
parent
4246a3d113
commit
44743d860e
@ -7,7 +7,6 @@ from collections import defaultdict
|
||||
|
||||
from pylinkirc import utils, world, conf
|
||||
from pylinkirc.log import log
|
||||
from pylinkirc.coremods import control
|
||||
from pylinkirc.coremods import permissions
|
||||
|
||||
### GLOBAL (statekeeping) VARIABLES
|
||||
@ -274,10 +273,7 @@ def spawnRelayServer(irc, remoteirc):
|
||||
log.exception('(%s) Failed to spawn server for %r (possible jupe?):',
|
||||
irc.name, remoteirc.name)
|
||||
# We will just bail here. Disconnect the bad network.
|
||||
try:
|
||||
control.remove_network(irc)
|
||||
except KeyError:
|
||||
pass
|
||||
irc.disconnect()
|
||||
return
|
||||
|
||||
# Mark the server as a relay server
|
||||
|
Loading…
Reference in New Issue
Block a user