opendev
/
gerritbot
Code Issues Proposed changes

Add support for server passwords 

Change-Id: I0e623df8848b214ef715b2e265e97b71b16d666a
This commit is contained in:
Erik Dalén 2012-10-31 15:00:18 -04:00 committed by Erik Dalén
parent 103f0987d0
commit 4959423fd1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -15,6 +15,7 @@ when starting the bot. It should look like:
pass=PASSWORD
server=irc.freenode.net
port=6667
server_password=SERVERPASS
channel_config=/path/to/yaml/config
[gerrit]

11
gerritbot/bot.py
View File

@ -22,6 +22,7 @@ nick=NICKNAME
pass=PASSWORD
server=irc.freenode.net
port=6667
server_password=SERVERPASS
channel_config=/path/to/yaml/config
[gerrit]
@ -65,9 +66,10 @@ except:
class GerritBot(irc.bot.SingleServerIRCBot):
def __init__(self, channels, nickname, password, server, port=6667):
def __init__(self, channels, nickname, password, server, port=6667,
server_password=None):
irc.bot.SingleServerIRCBot.__init__(self,
[(server, port)],
[(server, port, server_password)],
nickname, nickname)
self.channel_list = channels
self.nickname = nickname
@ -257,7 +259,7 @@ class ChannelConfig(object):
def _main():
config = ConfigParser.ConfigParser()
config = ConfigParser.ConfigParser({'server_password': None})
config.read(sys.argv[1])
setup_logging(config)
@ -275,7 +277,8 @@ def _main():
config.get('ircbot', 'nick'),
config.get('ircbot', 'pass'),
config.get('ircbot', 'server'),
config.getint('ircbot', 'port'))
config.getint('ircbot', 'port'),
config.get('ircbot', 'server_password'))
g = Gerrit(bot,
channel_config,
config.get('gerrit', 'host'),