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

IRCNetwork: suppress logging connection errors when PyLink is shutting down

Browse Source
This commit is contained in:
James Lu 2017-07-12 22:02:40 -07:00
parent bb2b57f9dd
commit f85bdb3d8b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes.py
View File

@ -25,6 +25,7 @@ except ImportError:
from . import world, utils, structures, conf, __version__ from . import world, utils, structures, conf, __version__
from .log import * from .log import *
from .coremods import control
### Exceptions ### Exceptions
@ -1134,6 +1135,14 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
log.debug('(%s) Ping scheduled at %s', self.name, time.time()) log.debug('(%s) Ping scheduled at %s', self.name, time.time())
def _log_connection_error(self, *args, **kwargs):
# Log connection errors to ERROR unless were shutting down (in which case,
# the given text goes to DEBUG).
if self.aborted.is_set() or control.tried_shutdown:
log.debug(*args, **kwargs)
else:
log.error(*args, **kwargs)
def _connect(self): def _connect(self):
""" """
Runs the connect loop for the IRC object. This is usually called by Runs the connect loop for the IRC object. This is usually called by
@ -1272,7 +1281,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
# We also catch SystemExit here as a way to abort out connection threads properly, and stop the # We also catch SystemExit here as a way to abort out connection threads properly, and stop the
# IRC connection from freezing instead. # IRC connection from freezing instead.
except (OSError, RuntimeError, SystemExit) as e: except (OSError, RuntimeError, SystemExit) as e:
log.exception('(%s) Disconnected from IRC:', self.name) self._log_connection_error('(%s) Disconnected from IRC:', self.name, exc_info=True)
self.disconnect() self.disconnect()
if not self._run_autoconnect(): if not self._run_autoconnect():
@ -1332,10 +1341,10 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
buf += data buf += data
if not data: if not data:
log.error('(%s) No data received, disconnecting!', self.name) self._log_connection_error('(%s) No data received, disconnecting!', self.name)
return return
elif (time.time() - self.lastping) > self.pingtimeout: elif (time.time() - self.lastping) > self.pingtimeout:
log.error('(%s) Connection timed out.', self.name) self._log_connection_error('(%s) Connection timed out.', self.name)
return return
while b'\n' in buf: while b'\n' in buf: