From b4e334afff57f7961fb9ee2ca8b45464e9c8ddc5 Mon Sep 17 00:00:00 2001 From: Florian Strzelecki Date: Sat, 8 Apr 2023 22:16:30 +0200 Subject: [PATCH] irc: separate ConnectionError from OSError --- sopel/irc/backends.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sopel/irc/backends.py b/sopel/irc/backends.py index 9db5061fe..29403f0de 100644 --- a/sopel/irc/backends.py +++ b/sopel/irc/backends.py @@ -394,10 +394,11 @@ async def _run_forever(self) -> None: **connection_kwargs, ) - # SSL Error + # SSL Errors (certificate verification and generic SSL errors) except ssl.SSLCertVerificationError as err: LOGGER.error( - 'Unable to connect due to SSL certificate verification failure: %s', + 'Unable to connect due to ' + 'SSL certificate verification failure: %s', err, ) self.log_exception() @@ -413,7 +414,7 @@ async def _run_forever(self) -> None: self.bot.wantsrestart = False return - # Specific connection error + # Specific connection error (invalid address and timeout) except socket.gaierror as err: LOGGER.error( 'Unable to connect due to invalid IRC server address: %s', @@ -438,12 +439,18 @@ async def _run_forever(self) -> None: self.bot.wantsrestart = False return - # Generic connection error (OSError is used for any connection error) + # Generic connection error + except ConnectionError as err: + LOGGER.error('Unable to connect: %s', err) + self.log_exception() + # tell the bot to quit without restart + self.bot.hasquit = True + self.bot.wantsrestart = False + return + + # Generic OSError (used for any unspecitic connection error) except OSError as err: - LOGGER.error( - 'Unable to connect: %s', - err, - ) + LOGGER.error('Unable to connect: %s', err) LOGGER.error( 'You should verify that "%s:%s" is the correct address ' 'to connect to the IRC server.',