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

IRCNetwork: mark connection_thread, pingTimer, socket, and queue as private

Browse Source
This commit is contained in:
James Lu 2017-07-12 22:56:30 -07:00
parent 2ef7df01e7
commit 2e7fed84c1
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
classes.py
View File

@ -1108,10 +1108,10 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.connection_thread = None
self.queue = None
self.pingTimer = None
self.socket = None
self._connection_thread = None
self._queue = None
self._ping_timer = None
self._socket = None
def init_vars(self, *args, **kwargs):
super().init_vars(*args, **kwargs)
@ -1122,16 +1122,16 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
self.pingtimeout = self.pingfreq * 3
self.maxsendq = self.serverdata.get('maxsendq', 4096)
self.queue = queue.Queue(self.maxsendq)
self._queue = queue.Queue(self.maxsendq)
def _schedule_ping(self):
"""Schedules periodic pings in a loop."""
self._ping_uplink()
self.pingTimer = threading.Timer(self.pingfreq, self._schedule_ping)
self.pingTimer.daemon = True
self.pingTimer.name = 'Ping timer loop for %s' % self.name
self.pingTimer.start()
self._ping_timer = threading.Timer(self.pingfreq, self._schedule_ping)
self._ping_timer.daemon = True
self._ping_timer.name = 'Ping timer loop for %s' % self.name
self._ping_timer.start()
log.debug('(%s) Ping scheduled at %s', self.name, time.time())
@ -1159,17 +1159,17 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
stype = socket.AF_INET6 if self.serverdata.get("ipv6") else socket.AF_INET
# Creat the socket.
self.socket = socket.socket(stype)
self.socket.setblocking(0)
self._socket = socket.socket(stype)
self._socket.setblocking(0)
# Set the socket bind if applicable.
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)
self._socket.settimeout(self.pingfreq)
# Resolve hostnames if it's not an IP address already.
old_ip = ip
@ -1200,18 +1200,18 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
self.name)
checks_ok = False
self.socket = context.wrap_socket(self.socket)
self._socket = context.wrap_socket(self._socket)
log.info("Connecting to network %r on %s:%s", self.name, ip, port)
self.socket.connect((ip, port))
self.socket.settimeout(self.pingtimeout)
self._socket.connect((ip, port))
self._socket.settimeout(self.pingtimeout)
# If SSL was enabled, optionally verify the certificate
# fingerprint for some added security. I don't bother to check
# the entire certificate for validity, since most IRC networks
# self-sign their certificates anyways.
if self.ssl and checks_ok:
peercert = self.socket.getpeercert(binary_form=True)
peercert = self._socket.getpeercert(binary_form=True)
# Hash type is configurable using the ssl_fingerprint_type
# value, and defaults to sha256.
@ -1249,9 +1249,9 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
if checks_ok:
self.queue_thread = threading.Thread(name="Queue thread for %s" % self.name,
self._queue_thread = threading.Thread(name="Queue thread for %s" % self.name,
target=self._process_queue, daemon=True)
self.queue_thread.start()
self._queue_thread.start()
self.sid = self.serverdata.get("sid")
# All our checks passed, get the protocol module to connect and run the listen
@ -1293,36 +1293,36 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
# HACK: Don't thread if we're running tests.
self._connect()
else:
if self.connection_thread and self.connection_thread.is_alive():
if self._connection_thread and self._connection_thread.is_alive():
raise RuntimeError("Refusing to start multiple connection threads for network %r!" % self.name)
self.connection_thread = threading.Thread(target=self._connect,
self._connection_thread = threading.Thread(target=self._connect,
name="Listener for %s" %
self.name)
self.connection_thread.start()
self._connection_thread.start()
def disconnect(self):
"""Handle disconnects from the remote server."""
self._pre_disconnect()
if self.socket is not None:
if self._socket is not None:
try:
log.debug('(%s) disconnect: Shutting down socket.', self.name)
self.socket.shutdown(socket.SHUT_RDWR)
self._socket.shutdown(socket.SHUT_RDWR)
except Exception as e: # Socket timed out during creation; ignore
log.debug('(%s) error on socket shutdown: %s: %s', self.name, type(e).__name__, e)
self.socket.close()
self._socket.close()
# Stop the queue thread.
if self.queue:
if self._queue:
# XXX: queue.Queue.queue isn't actually documented, so this is probably not reliable in the long run.
self.queue.queue.appendleft(None)
self._queue.queue.appendleft(None)
# Stop the ping timer.
if self.pingTimer:
if self._ping_timer:
log.debug('(%s) Canceling pingTimer at %s due to disconnect() call', self.name, time.time())
self.pingTimer.cancel()
self._ping_timer.cancel()
self._post_disconnect()
def _run_irc(self):
@ -1332,7 +1332,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
while not self.aborted.is_set():
try:
data = self.socket.recv(2048)
data = self._socket.recv(2048)
except OSError:
# Suppress socket read warnings from lingering recv() calls if
# we've been told to shutdown.
@ -1364,7 +1364,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
log.debug("(%s) -> %s", self.name, data)
try:
self.socket.send(encoded_data)
self._socket.send(encoded_data)
except (OSError, AttributeError):
log.exception("(%s) Failed to send message %r; did the network disconnect?", self.name, data)
@ -1376,7 +1376,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
if queue:
# XXX: we don't really know how to handle blocking queues yet, so
# it's better to not expose that yet.
self.queue.put_nowait(data)
self._queue.put_nowait(data)
else:
self._send(data)
@ -1385,7 +1385,7 @@ class IRCNetwork(PyLinkNetworkCoreWithUtils):
while True:
throttle_time = self.serverdata.get('throttle_time', 0.005)
if not self.aborted.wait(throttle_time):
data = self.queue.get()
data = self._queue.get()
if data is None:
log.debug('(%s) Stopping queue thread due to getting None as item', self.name)
break

2
coremods/control.py
View File

@ -129,7 +129,7 @@ def rehash():
for network, sdata in new_conf['servers'].items():
# Connect any new networks or disconnected networks if they aren't already.
if (network not in world.networkobjects) or (not world.networkobjects[network].connection_thread.is_alive()):
if (network not in world.networkobjects) or (not world.networkobjects[network]._connection_thread.is_alive()):
proto = utils.getProtocolModule(sdata['protocol'])
# API note: 2.0.x style of starting network connections

2
coremods/corecommands.py
View File

@ -201,4 +201,4 @@ def clearqueue(irc, source, args):
Clears the outgoing text queue for the current connection."""
permissions.checkPermissions(irc, source, ['core.clearqueue'])
irc.queue.queue.clear()
irc._queue.queue.clear()