X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/7631844f5bbb005b130cccc33d2dce9510c0f9df..5f42c250f797d8cf1bca89d431134764d97c63fd:/erebus.py diff --git a/erebus.py b/erebus.py index c03c980..34a4ef1 100644 --- 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 @@ -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,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()