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

classes: more checks on _aborted to (hopefully) prevent duplicate disconnects triggered by _send

Browse Source
This commit is contained in:
James Lu 2018-03-30 10:47:34 -07:00
parent 93d590fdea
commit f274088ea0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes.py
View File

@ -1720,6 +1720,10 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
def _send(self, data): def _send(self, data):
"""Sends raw text to the uplink server.""" """Sends raw text to the uplink server."""
if self._aborted.is_set():
log.debug("(%s) Not sending message %r since the connection is dead", self.name, data)
return
# Safeguard against newlines in input!! Otherwise, each line gets # Safeguard against newlines in input!! Otherwise, each line gets
# treated as a separate command, which is particularly nasty. # treated as a separate command, which is particularly nasty.
data = data.replace('\n', ' ') data = data.replace('\n', ' ')
@ -1760,6 +1764,11 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
elif self not in world.networkobjects.values(): elif self not in world.networkobjects.values():
log.debug('(%s) Stopping stale queue thread; no longer matches world.networkobjects', self.name) log.debug('(%s) Stopping stale queue thread; no longer matches world.networkobjects', self.name)
break break
elif self._aborted.is_set():
# The _aborted flag may have changed while we were waiting for an item,
# so check for it again.
log.debug('(%s) Stopping queue thread since the connection is dead', self.name)
return
elif data: elif data:
self._send(data) self._send(data)
else: else: