From 067bc37ec09c9fd3b13c14135c92fe4ce1836ef4 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 12 Nov 2021 14:49:35 +1100 Subject: [PATCH] Revert "Add use_ssl option" This broke the OpenDev connection, we should figure out why This reverts commit 4c31332e23ed49fe9748d97c5a81b3097836aabc. Change-Id: I944b1a5e8dcb451374ad07c2f34ba873cc9b11ca --- statusbot/bot.py | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/statusbot/bot.py b/statusbot/bot.py index 58e40fc..6801083 100755 --- a/statusbot/bot.py +++ b/statusbot/bot.py @@ -354,7 +354,7 @@ class AlertFile(UpdateInterface): self.write(None) -class BaseStatusBot(irc.bot.SingleServerIRCBot): +class BaseStatusBot(SSL, irc.bot.SingleServerIRCBot): log = logging.getLogger("statusbot.bot") def on_pubmsg(self, c, e): @@ -556,29 +556,20 @@ def _main(configpath): else: use_sasl = False if use_sasl: - base = SASLStatusBot + bot = SASLStatusBot(channels, nicks, publishers, successlog, + thankslog, + config.get('ircbot', 'nick'), + config.get('ircbot', 'pass'), + config.get('ircbot', 'server'), + config.getint('ircbot', 'port')) else: - base = NoSASLStatusBot - - if config.has_option('ircbot', 'use_ssl'): - use_ssl = config.getboolean('ircbot', 'use_ssl') - else: - use_ssl = False - - # SSL is set through class inheritance. - if use_ssl: - class Bot(base, SSL): - pass - else: - class Bot(base): - pass - - Bot(channels, nicks, publishers, successlog, - thankslog, - config.get('ircbot', 'nick'), - config.get('ircbot', 'pass'), - config.get('ircbot', 'server'), - config.getint('ircbot', 'port')).start() + bot = NoSASLStatusBot(channels, nicks, publishers, successlog, + thankslog, + config.get('ircbot', 'nick'), + config.get('ircbot', 'pass'), + config.get('ircbot', 'server'), + config.getint('ircbot', 'port')) + bot.start() def main():