adding timestamp to debug messages

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index c1ac5d054a97fcba44d7fd6f1dc2514ca1bf1dfd..b237347d27b73b68f06c21f045c84db449306ba3 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -3,8 +3,6 @@
 # Erebus IRC bot - Author: John Runyon
 # main startup code
 
-#TODO: tons
-
 import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
 import bot, config, ctlmod
 
@@ -28,6 +26,9 @@ class Erebus(object):
 
                        self.chans = []
 
+               def msg(self, *args, **kwargs):
+                       main.randbot.msg(self, *args, **kwargs)
+
                def isauthed(self):
                        return self.auth is not None
 
@@ -58,6 +59,8 @@ class Erebus(object):
                def quit(self):
                        for chan in self.chans:
                                self.chans.remove(chan)
+               def nickchange(self, newnick):
+                       self.nick = newnick
 
                def __str__(self): return self.nick
                def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
@@ -80,6 +83,9 @@ class Erebus(object):
                                        row = c.fetchone()
 
 
+               def msg(self, *args, **kwargs):
+                       self.bot.msg(self.name, *args, **kwargs)
+
                def levelof(self, auth):
                        if auth is None:
                                return 0
@@ -130,9 +136,9 @@ class Erebus(object):
                        self.potype = "select"
                        self.fdlist = []
 
-       def newbot(self, nick, user, bind, server, port, realname):
+       def newbot(self, nick, user, bind, authname, authpass, server, port, realname):
                if bind is None: bind = ''
-               obj = bot.Bot(self, nick, user, bind, server, port, realname)
+               obj = bot.Bot(self, nick, user, bind, authname, authpass, server, port, realname)
                self.bots[nick.lower()] = obj
 
        def newfd(self, obj, fileno):
@@ -251,16 +257,22 @@ def setup():
 
        autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
        for mod in autoloads:
-               print "Loading %s" % (mod)
-               ctlmod.load(main, mod)
+               print "Loading %s ... " % (mod),
+               modstatus = ctlmod.load(main, mod)
+               if not modstatus:
+                       print str(modstatus)
+               elif modstatus == True:
+                       print "OK"
+               else:
+                       print modstatus
 
        dbsetup()
        c = main.db.cursor()
-       if c.execute("SELECT nick, user, bind FROM bots WHERE active = 1"):
+       if c.execute("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1"):
                rows = c.fetchall()
                c.close()
                for row in rows:
-                       main.newbot(row['nick'], row['user'], row['bind'], cfg.host, cfg.port, cfg.realname)
+                       main.newbot(row['nick'], row['user'], row['bind'], row['authname'], row['authpass'], cfg.host, cfg.port, cfg.realname)
        main.connectall()
 
 def loop():