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

plugins: use irc.disconnect() to disconnect networks (#152)

Browse Source
This commit is contained in:
James Lu 2016-01-09 20:03:42 -08:00
parent f70ca54ae4
commit 989f1f4f64
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreplugin.py
View File

@ -177,7 +177,7 @@ def shutdown(irc, source, args):
for ircobj in world.networkobjects.values(): for ircobj in world.networkobjects.values():
# Disable auto-connect first by setting the time to negative. # Disable auto-connect first by setting the time to negative.
ircobj.serverdata['autoconnect'] = -1 ircobj.serverdata['autoconnect'] = -1
ircobj.disconnect(callhook=False) ircobj.disconnect()
def load(irc, source, args): def load(irc, source, args):
"""<plugin name>. """<plugin name>.

3
plugins/networks.py
View File

@ -28,8 +28,9 @@ def disconnect(irc, source, args):
irc.reply('Error: No such network "%s" (case sensitive).' % netname) irc.reply('Error: No such network "%s" (case sensitive).' % netname)
return return
irc.reply("Done.") irc.reply("Done.")
# Abort the connection! Simple as that. # Abort the connection! Simple as that.
network.aborted.set() network.disconnect()
@utils.add_cmd @utils.add_cmd
def connect(irc, source, args): def connect(irc, source, args):

4
plugins/relay.py
View File

@ -204,7 +204,7 @@ def getRemoteSid(irc, remoteirc):
except ValueError: # Network not initialized yet. except ValueError: # Network not initialized yet.
log.exception('(%s) Failed to spawn server for %r:', log.exception('(%s) Failed to spawn server for %r:',
irc.name, remoteirc.name) irc.name, remoteirc.name)
irc.aborted.set() irc.disconnect()
return return
else: else:
irc.servers[sid].remote = remoteirc.name irc.servers[sid].remote = remoteirc.name
@ -981,7 +981,7 @@ def handle_kill(irc, numeric, command, args):
else: else:
log.error('(%s) Too many kills received for target %s, aborting!', log.error('(%s) Too many kills received for target %s, aborting!',
irc.name, userdata.nick) irc.name, userdata.nick)
irc.aborted.set() irc.disconnect()
killcache[irc.name] += 1 killcache[irc.name] += 1
# Target user was local. # Target user was local.