From 137d5b1a58a28160119ee6f2f0a4d9f3a8657f50 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Mon, 11 Feb 2019 20:34:02 +0000
Subject: `connected` status is now tracked by IRCSockets

---
 src/IRCBot.py    | 2 +-
 src/IRCServer.py | 2 --
 src/IRCSocket.py | 3 +++
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/IRCBot.py b/src/IRCBot.py
index 59b3837f..843ef53d 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -228,7 +228,7 @@ class Bot(object):
                 elif server.ping_due() and not server.ping_sent:
                     server.send_ping()
                     server.ping_sent = True
-                if not server.connected:
+                if not server.socket.connected:
                     self._events.on("server.disconnect").call(server=server)
                     self.disconnect(server)
 
diff --git a/src/IRCServer.py b/src/IRCServer.py
index bc800ed4..25f8a495 100644
--- a/src/IRCServer.py
+++ b/src/IRCServer.py
@@ -13,7 +13,6 @@ class Server(IRCObject.Object):
             id: int,
             alias: typing.Optional[str],
             connection_params: utils.irc.IRCConnectionParameters):
-        self.connected = False
         self.bot = bot
         self.events = events
         self.id = id
@@ -108,7 +107,6 @@ class Server(IRCObject.Object):
 
         self.send_user(username, realname)
         self.send_nick(nickname)
-        self.connected = True
 
     def disconnect(self):
         self.socket.disconnect()
diff --git a/src/IRCSocket.py b/src/IRCSocket.py
index 9daa89cb..a243877e 100644
--- a/src/IRCSocket.py
+++ b/src/IRCSocket.py
@@ -23,6 +23,8 @@ class Socket(IRCObject.Object):
         self._cert = cert
         self._key = key
 
+        self.connected = False
+
         self._write_buffer = b""
         self._queued_lines = [] # type: typing.List[IRCLine.Line]
         self._buffered_lines = [] # type: typing.List[IRCLine.Line]
@@ -61,6 +63,7 @@ class Socket(IRCObject.Object):
         self._socket.connect((self._hostname, self._port))
         self.connected_ip, port = self._socket.getpeername()
         self.cached_fileno = self._socket.fileno()
+        self.connected = True
 
     def disconnect(self):
         self.connected = False
-- 
cgit v1.3.1-10-gc9f91