From 72ce8804788c24df24f5af6d79cc7d645e7b9137 Mon Sep 17 00:00:00 2001 From: jesopo Date: Mon, 17 Jun 2019 14:20:11 +0100 Subject: [PATCH] Only `panic()` when a server connection is part of bot init. closes #69 --- modules/ircv3_sasl/__init__.py | 2 +- src/IRCServer.py | 6 ++++-- start.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/ircv3_sasl/__init__.py b/modules/ircv3_sasl/__init__.py index 58442b87..e1ca6193 100644 --- a/modules/ircv3_sasl/__init__.py +++ b/modules/ircv3_sasl/__init__.py @@ -145,7 +145,7 @@ class Module(ModuleManager.BaseModule): def _panic(self, server, message): message = "SASL panic for %s: %s" % (str(server), message) - if server.reconnected: + if not server.from_init: self.log.error(message) self.bot.disconnect(server) else: diff --git a/src/IRCServer.py b/src/IRCServer.py index 819de8ab..0316cc60 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -17,11 +17,13 @@ class Server(IRCObject.Object): self.id = id self.alias = alias self.connection_params = connection_params - self.connected = False - self.reconnected = False self.name = None # type: typing.Optional[str] self.version = None # type: typing.Optional[str] + self.connected = False + self.reconnected = False + self.from_init = False + self.nickname = None # type: typing.Optional[str] self.username = None # type: typing.Optional[str] self.realname = None # type: typing.Optional[str] diff --git a/start.py b/start.py index 40af967e..be24e24b 100755 --- a/start.py +++ b/start.py @@ -92,6 +92,7 @@ if len(server_configs): for server_id, alias in server_configs: server = bot.add_server(server_id, connect=False) if not server == None and server.get_setting("connect", True): + server.from_init = True servers.append(server) bot._events.on("boot.done").call()