opendev/statusbot
Code Issues Proposed changes

Revert "Add use_ssl option"

Browse Source 
This broke the OpenDev connection, we should figure out why

This reverts commit 4c31332e23ed49fe9748d97c5a81b3097836aabc.

Change-Id: I944b1a5e8dcb451374ad07c2f34ba873cc9b11ca
This commit is contained in:
Ian Wienand 2021-11-12 14:49:35 +11:00
parent 4c31332e23
commit 067bc37ec0
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
statusbot/bot.py
View File

@ -354,7 +354,7 @@ class AlertFile(UpdateInterface):
self.write(None) self.write(None)
class BaseStatusBot(irc.bot.SingleServerIRCBot): class BaseStatusBot(SSL, irc.bot.SingleServerIRCBot):
log = logging.getLogger("statusbot.bot") log = logging.getLogger("statusbot.bot")
def on_pubmsg(self, c, e): def on_pubmsg(self, c, e):
@ -556,29 +556,20 @@ def _main(configpath):
else: else:
use_sasl = False use_sasl = False
if use_sasl: 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: else:
base = NoSASLStatusBot bot = NoSASLStatusBot(channels, nicks, publishers, successlog,
thankslog,
if config.has_option('ircbot', 'use_ssl'): config.get('ircbot', 'nick'),
use_ssl = config.getboolean('ircbot', 'use_ssl') config.get('ircbot', 'pass'),
else: config.get('ircbot', 'server'),
use_ssl = False config.getint('ircbot', 'port'))
bot.start()
# 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()
def main(): def main():