From ce3b319beec2126a46f1f918f10bccd664038cb5 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Mon, 5 Nov 2018 20:33:45 +0000
Subject: Only automatically reconnect to a server when we don't already have a
 server with the same ID (to make reconnection work)

---
 src/IRCBot.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/IRCBot.py b/src/IRCBot.py
index 10197509..322e9844 100644
--- a/src/IRCBot.py
+++ b/src/IRCBot.py
@@ -134,10 +134,6 @@ class Bot(object):
             event["timer"].redo()
     def reconnect(self, server_id: int, connection_params: typing.Optional[
             utils.irc.IRCConnectionParameters]=None) -> bool:
-        old_server = self.get_server(server_id)
-        if old_server:
-            self.disconnect(old_server)
-
         server = self.add_server(server_id, False, connection_params)
         if self.connect(server):
             self.servers[server.fileno()] = server
@@ -208,13 +204,14 @@ class Bot(object):
                     self._events.on("server.disconnect").call(server=server)
                     self.disconnect(server)
 
-                    reconnect_delay = self.config.get("reconnect-delay", 10)
-                    self._timers.add("reconnect", reconnect_delay,
-                        server_id=server.id,
-                        connection_params=server.connection_params)
-
-                    print("disconnected from %s, reconnecting in %d seconds" % (
-                        str(server), reconnect_delay))
+                    if not self.get_server(server.id):
+                        reconnect_delay = self.config.get("reconnect-delay", 10)
+                        self._timers.add("reconnect", reconnect_delay,
+                            server_id=server.id,
+                            connection_params=server.connection_params)
+                        self.log.info(
+                            "Disconnected from %s, reconnecting in %d seconds",
+                            [str(server), reconnect_delay])
                 elif server.waiting_send() and server.throttle_done():
                     self.register_both(server)
 
-- 
cgit v1.3.1-10-gc9f91