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

Irc: make was_successful check the last Irc.connected state

Browse Source
This commit is contained in:
James Lu 2017-02-24 22:09:41 -08:00
parent cd65da75c6
commit 04fa0520a6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes.py
View File

@ -192,7 +192,6 @@ class Irc():
ip = self.serverdata["ip"] ip = self.serverdata["ip"]
port = self.serverdata["port"] port = self.serverdata["port"]
checks_ok = True checks_ok = True
errored = False
try: try:
# Set the socket type (IPv6 or IPv4). # Set the socket type (IPv6 or IPv4).
stype = socket.AF_INET6 if self.serverdata.get("ipv6") else socket.AF_INET stype = socket.AF_INET6 if self.serverdata.get("ipv6") else socket.AF_INET
@ -318,12 +317,12 @@ class Irc():
# exception, meaning we've disconnected! # exception, meaning we've disconnected!
log.error('(%s) Disconnected from IRC: %s: %s', log.error('(%s) Disconnected from IRC: %s: %s',
self.name, type(e).__name__, str(e)) self.name, type(e).__name__, str(e))
errored = True
was_successful = self.connected.is_set()
self.disconnect() self.disconnect()
# Internal hook signifying that a network has disconnected. # Internal hook signifying that a network has disconnected.
self.callHooks([None, 'PYLINK_DISCONNECT', {'was_successful': checks_ok and not errored}]) self.callHooks([None, 'PYLINK_DISCONNECT', {'was_successful': checks_ok and was_successful}])
# If autoconnect is enabled, loop back to the start. Otherwise, # If autoconnect is enabled, loop back to the start. Otherwise,
# return and stop. # return and stop.
@ -1536,5 +1535,4 @@ class Protocol():
def handle_error(self, numeric, command, args): def handle_error(self, numeric, command, args):
"""Handles ERROR messages - these mean that our uplink has disconnected us!""" """Handles ERROR messages - these mean that our uplink has disconnected us!"""
self.irc.connected.clear()
raise ProtocolError('Received an ERROR, disconnecting!') raise ProtocolError('Received an ERROR, disconnecting!')