include last and current question id in badq report

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 2783bd5a32d4846cf64089203bb4122b8e623141..34a4ef133b338e5485b542b0170108c2e254cbf7 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)
@@ -232,11 +235,11 @@ class Erebus(object):
 
 class MyCursor(MySQLdb.cursors.DictCursor):
        def execute(self, *args, **kwargs):
-               print "[SQL] [#] MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
+               print "%05.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
                try:
                        super(self.__class__, self).execute(*args, **kwargs)
                except MySQLdb.MySQLError as e:
-                       print "[SQL] [!] MySQL error! %r" % (e)
+                       print "%05.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
                        dbsetup()
                        return False
                return True
@@ -254,7 +257,6 @@ 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)
 
        dbsetup()