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

classes: thread socket connects once more since they block

Browse Source
This commit is contained in:
James Lu 2018-04-07 21:22:18 -07:00
parent 655221491c
commit 84dbca4bda
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
classes.py
View File

@ -1462,7 +1462,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
else: else:
log.error(*args, **kwargs) log.error(*args, **kwargs)
def connect(self): def _connect(self):
""" """
Connects to the network. Connects to the network.
""" """
@ -1482,11 +1482,6 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
if 'bindhost' in self.serverdata: if 'bindhost' in self.serverdata:
self._socket.bind((self.serverdata['bindhost'], 0)) self._socket.bind((self.serverdata['bindhost'], 0))
# Set the connection timeouts. Initial connection timeout is a
# lot smaller than the timeout after we've connected; this is
# intentional.
self._socket.settimeout(self.pingfreq)
# Resolve hostnames if it's not an IP address already. # Resolve hostnames if it's not an IP address already.
old_ip = ip old_ip = ip
ip = socket.getaddrinfo(ip, port, stype)[0][-1][0] ip = socket.getaddrinfo(ip, port, stype)[0][-1][0]
@ -1520,12 +1515,25 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
log.info("Connecting to network %r on %s:%s", self.name, ip, port) log.info("Connecting to network %r on %s:%s", self.name, ip, port)
# Use a lower timeout for the initial connect.
self._socket.settimeout(self.pingfreq)
try: try:
self._socket.connect((ip, port)) self._socket.connect((ip, port))
except (ssl.SSLError, OSError): except (ssl.SSLError, OSError):
log.exception('Unable to connect to network %r', self.name) log.exception('Unable to connect to network %r', self.name)
self._start_reconnect() self._start_reconnect()
return return
if self not in world.networkobjects.values():
log.debug("(%s) _connect: disconnecting socket %s as the network was removed",
self.name, self._socket)
try:
self._socket.shutdown(socket.SHUT_RDWR)
finally:
self._socket.close()
return
self._socket.settimeout(self.pingtimeout) self._socket.settimeout(self.pingtimeout)
self._selector_key = selectdriver.register(self) self._selector_key = selectdriver.register(self)
@ -1607,6 +1615,15 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
if not self._aborted.is_set(): if not self._aborted.is_set():
self.disconnect() self.disconnect()
def connect(self):
"""
Starts a thread to connect the network.
"""
connect_thread = threading.Thread(target=self._connect, daemon=True,
name="Connect thread for %s" %
self.name)
connect_thread.start()
def disconnect(self): def disconnect(self):
"""Handle disconnects from the remote server.""" """Handle disconnects from the remote server."""
if self._aborted.is_set(): if self._aborted.is_set():
@ -1658,7 +1675,10 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
if self._run_autoconnect(): if self._run_autoconnect():
self.connect() self.connect()
if self._reconnect_thread is None or not self._reconnect_thread.is_alive(): if self not in world.networkobjects.values():
log.debug('(%s) _start_reconnect: Stopping reconnect timer as the network was removed', self.name)
return
elif self._reconnect_thread is None or not self._reconnect_thread.is_alive():
self._reconnect_thread = threading.Thread(target=_reconnect, name="Reconnecting network %s" % self.name) self._reconnect_thread = threading.Thread(target=_reconnect, name="Reconnecting network %s" % self.name)
self._reconnect_thread.start() self._reconnect_thread.start()
else: else: