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

core: abort autoconnect and socket connectons when the daemon is shutting down

Browse Source
This commit is contained in:
James Lu 2017-08-31 13:40:11 -07:00
parent 82a7b914b6
commit 5c981c83b1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes.py
View File

@ -349,6 +349,10 @@ class PyLinkNetworkCore(structures.DeprecatedAttributesObject, structures.CamelC
def _run_autoconnect(self): def _run_autoconnect(self):
"""Blocks for the autoconnect time and returns True if autoconnect is enabled.""" """Blocks for the autoconnect time and returns True if autoconnect is enabled."""
if world.shutting_down.is_set():
log.debug('(%s) _run_autoconnect: aborting autoconnect attempt since we are shutting down.', self.name)
return
autoconnect = self.serverdata.get('autoconnect') autoconnect = self.serverdata.get('autoconnect')
# Sets the autoconnect growth multiplier (e.g. a value of 2 multiplies the autoconnect # Sets the autoconnect growth multiplier (e.g. a value of 2 multiplies the autoconnect
@ -1478,7 +1482,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
"""Main IRC loop which listens for messages.""" """Main IRC loop which listens for messages."""
buf = b"" buf = b""
data = b"" data = b""
while not self._aborted.is_set(): while (not self._aborted.is_set()) and not world.shutting_down.is_set():
try: try:
data = self._socket.recv(2048) data = self._socket.recv(2048)