Merge pull request CloudBotIRC#172 from linuxdaemon/gonzobot+fix-reconnect

Fix handling of connection errors

Author: edwardslabs

cloudbot/client.py

@@ -79,7 +79,7 @@ def try_connect(self):
             try:
                 yield from self.connect(timeout)
             except Exception:
-                logger.exception("[%s] Error occurred while connecting.")
+                logger.exception("[%s] Error occurred while connecting.", self.name)
             else:
                 break
 

cloudbot/clients/irc.py

@@ -126,11 +126,13 @@ def connect(self, timeout=None):
             return
 
         if self._connected:
+            self._connected = False
             logger.info("[{}] Reconnecting".format(self.name))
-            self._transport.close()
+            if self._transport:
+                self._transport.close()
         else:
-            self._connected = True
             logger.info("[{}] Connecting".format(self.name))
+
         optional_params = {}
         if self.local_bind:
             optional_params["local_addr"] = self.local_bind
@@ -144,6 +146,8 @@ def connect(self, timeout=None):
 
         self._transport, self._protocol = yield from coro
 
+        self._connected = True
+
         tasks = [
             self.bot.plugin_manager.launch(hook, Event(bot=self.bot, conn=self, hook=hook))
             for hook in self.bot.plugin_manager.connect_hooks
@@ -303,14 +307,14 @@ def connection_lost(self, exc):
             # we've been closed intentionally, so don't reconnect
             return
         logger.error("[{}] Connection lost: {}".format(self.conn.name, exc))
-        async_util.wrap_future(self.conn.connect(), loop=self.loop)
+        async_util.wrap_future(self.conn.try_connect(), loop=self.loop)
 
     def eof_received(self):
         self._connected = False
         # create a new connected_future for when we are connected.
         self._connected_future = async_util.create_future(self.loop)
         logger.info("[{}] EOF received.".format(self.conn.name))
-        async_util.wrap_future(self.conn.connect(), loop=self.loop)
+        async_util.wrap_future(self.conn.try_connect(), loop=self.loop)
         return True
 
     @asyncio.coroutine

plugins/core/check_conn.py

@@ -15,7 +15,7 @@ def conncheck(nick, bot, notice):
         notice("{}, {}".format(conn, bot.connections[conn].connected))
         # if the value is in fact false try to connect
         if not bot.connections[conn].connected:
-            bot.connections[conn].connect()
+            bot.connections[conn].try_connect()
         # Send a message from each irc network connection to the nick that issued the command
         bot.connections[conn].message(nick, "just letting you know I am here. {}".format(conn))
 
@@ -27,7 +27,7 @@ def do_reconnect(conn):
         yield from asyncio.sleep(2)
         conn._quit = False
 
-    coro = conn.connect()
+    coro = conn.try_connect()
     try:
         yield from asyncio.wait_for(coro, 30)
     except asyncio.TimeoutError: