reworked module and sql debug messages

diff --git a/ctlmod.py b/ctlmod.py
index db8a5b88f63a3d1a35a5495341cbd57f7f8b98f5..ab9145a249baf0b501e2bc6c4cd93eb6f298c9ef 100644 (file)
--- a/ctlmod.py
+++ b/ctlmod.py
@@ -1,7 +1,7 @@
 # Erebus IRC bot - Author: John Runyon
 # module loading/unloading/tracking code
 
-import sys
+import sys, time
 import modlib
 
 modules = {}
@@ -10,7 +10,25 @@ dependents = {}
 def isloaded(modname): return modname in modules
 def modhas(modname, attname): return getattr(modules[modname], attname, None) is not None
 
-def load(parent, modname):
+def load(parent, modname, dependent=False):
+       #wrapper to call _load and print return
+       if dependent:
+               print "Loading dependency %s..." % (modname),
+       else:
+               print "%05.3f [MOD] [#] Loading %s... " % (time.time() % 100000, modname),
+       modstatus = _load(parent, modname, dependent)
+       if not modstatus:
+               print str(modstatus)
+       elif modstatus == True:
+               if dependent:
+                       print "OK. ",
+               else:
+                       print "OK."
+       else:
+               print modstatus
+       return modstatus
+
+def _load(parent, modname, dependent=False):
        if not isloaded(modname):
                sys.path.insert(0, 'modules')
                try:
@@ -33,7 +51,7 @@ def load(parent, modname):
 
                for dep in mod.modinfo['depends']:
                        if dep not in modules:
-                               depret = load(parent, dep)
+                               depret = load(parent, dep, dependent=True)
                                if not depret:
                                        return
                        dependents[dep].append(modname)

diff --git a/erebus.py b/erebus.py
index b237347d27b73b68f06c21f045c84db449306ba3..34a4ef133b338e5485b542b0170108c2e254cbf7 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -235,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
@@ -257,14 +257,7 @@ def setup():
 
        autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
        for mod in autoloads:
-               print "Loading %s ... " % (mod),
-               modstatus = ctlmod.load(main, mod)
-               if not modstatus:
-                       print str(modstatus)
-               elif modstatus == True:
-                       print "OK"
-               else:
-                       print modstatus
+               ctlmod.load(main, mod)
 
        dbsetup()
        c = main.db.cursor()