adding timestamp to debug messages

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index ef45b792f691d8461134500c60bc8e83acb7a34a..b237347d27b73b68f06c21f045c84db449306ba3 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -59,7 +59,7 @@ class Erebus(object):
                def quit(self):
                        for chan in self.chans:
                                self.chans.remove(chan)
-               def nick(self, newnick):
+               def nickchange(self, newnick):
                        self.nick = newnick
 
                def __str__(self): return self.nick
@@ -153,7 +153,7 @@ class Erebus(object):
        def fd(self, fileno): #get Bot() by fd/fileno
                return self.fds[fileno]
        def randbot(self): #get Bot() randomly
-               return random.choice(self.bots)
+               return self.bots[random.choice(self.bots.keys())]
 
        def user(self, _nick, justjoined=False):
                nick = _nick.lower()
@@ -257,8 +257,14 @@ 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()