admin_channel -> channel_admin, add fclevel alias

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 681400febb9ffbcdd7748516f56541e401508552..8b58d39b487fac0e5f0318582eb1a3139fceabbb 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -71,6 +71,7 @@ class Bot(object):
        def watchdog(self):
                if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
                        self.parse("ERROR :Fake-error from watchdog timer.")
+                       return
                if self.conn.registered():
                        self.conn.send("PING :%s" % (time.time()))
                        self._checknick()
@@ -99,8 +100,6 @@ class Bot(object):
                        self.conn.send("NICK %s" % (self.permnick))
 
        def parse(self, line):
-               if self.parent.cfg.getboolean('debug', 'io'):
-                       self.log('I', line)
                pieces = line.split()
 
                if pieces[0][0] == ":":
@@ -558,6 +557,9 @@ class BotConnection(object):
                return True
        def register(self):
                if self.state == 0:
+                       pss = self.parent.parent.cfg.get('erebus', 'pass')
+                       if pss:
+                               self.send("PASS %s" % (pss))
                        self.send("NICK %s" % (self.parent.nick))
                        self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
                        self.state = 1