* - change old code to use newer cfg.getboolean instead of bool(int())

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 7588838494f5b314c85f5af9629991419a582aaa..524b9a451ae589f825635b353800316acdbfb986 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -3,11 +3,11 @@
 # Erebus IRC bot - Author: John Runyon
 # main startup code
 
-import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
+import os, sys, select, MySQLdb, MySQLdb.cursors, time, random, gc
 import bot, config, ctlmod
 
-class Erebus(object):
-       APIVERSION = 1
+class Erebus(object): #singleton to pass around
+       APIVERSION = 2
        RELEASE = 0
 
        bots = {}
@@ -45,8 +45,8 @@ class Erebus(object):
                        if self.auth is None:
                                self.glevel = -1
                        else:
-                               c = main.db.cursor()
-                               if c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,)):
+                               c = main.query("SELECT level FROM users WHERE auth = %s", (self.auth,))
+                               if c:
                                        row = c.fetchone()
                                        if row is not None:
                                                self.glevel = row['level']
@@ -81,8 +81,8 @@ class Erebus(object):
                        self.voices = []
                        self.ops = []
 
-                       c = main.db.cursor()
-                       if c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,)):
+                       c = main.query("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
+                       if c:
                                row = c.fetchone()
                                while row is not None:
                                        self.levels[row['user']] = row['level']
@@ -108,8 +108,8 @@ class Erebus(object):
                def setlevel(self, auth, level, savetodb=True):
                        auth = auth.lower()
                        if savetodb:
-                               c = main.db.cursor()
-                               if c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level)):
+                               c = main.query("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level))
+                               if c:
                                        self.levels[auth] = level
                                        return True
                                else:
@@ -146,6 +146,29 @@ class Erebus(object):
                        self.potype = "select"
                        self.fdlist = []
 
+       def query(self, *args, **kwargs):
+               if 'norecurse' in kwargs:
+                       norecurse = kwargs['norecurse']
+                       del kwargs['norecurse']
+               else:
+                       norecurse = False
+
+               self.log("[SQL]", "?", "query(%s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs])))
+               try:
+                       curs = self.db.cursor()
+                       res = curs.execute(*args, **kwargs)
+                       if res:
+                               return curs
+                       else:
+                               return res
+               except MySQLdb.MySQLError as e:
+                       self.log("[SQL]", "!", "MySQL error! %r" % (e))
+                       if not norecurse:
+                               dbsetup()
+                               return self.query(*args, norecurse=True, **kwargs)
+                       else:
+                               raise e
+
        def newbot(self, nick, user, bind, authname, authpass, server, port, realname):
                if bind is None: bind = ''
                obj = bot.Bot(self, nick, user, bind, authname, authpass, server, port, realname)
@@ -204,6 +227,12 @@ class Erebus(object):
        def module(self, name):
                return ctlmod.modules[name]
 
+       def log(self, source, level, message):
+               print "%09.3f %s [%s] %s" % (time.time() % 100000, source, level, message)
+
+       def getuserbyauth(self, auth):
+               return [u for u in self.users.itervalues() if u.auth == auth.lower()]
+
        #bind functions
        def hook(self, word, handler):
                try:
@@ -245,26 +274,17 @@ class Erebus(object):
                return self.chanhandlers[chan]
 
 
-class MyCursor(MySQLdb.cursors.DictCursor):
-       def execute(self, *args, **kwargs):
-               print "%09.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 "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
-                       dbsetup()
-                       return False
-               return True
-
-
 def dbsetup():
        main.db = None
-       main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MyCursor)
+       main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MySQLdb.cursors.DictCursor)
 
 def setup():
        global cfg, main
 
-       cfg = config.Config('bot.config')
+       cfg = config.setup('bot.config')
+
+       if cfg.getboolean('debug', 'gc'):
+               gc.set_debug(gc.DEBUG_LEAK)
 
        pidfile = open(cfg.pidfile, 'w')
        pidfile.write(str(os.getpid()))
@@ -277,8 +297,8 @@ def setup():
                ctlmod.load(main, mod)
 
        dbsetup()
-       c = main.db.cursor()
-       if c.execute("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1"):
+       c = main.query("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1")
+       if c:
                rows = c.fetchall()
                c.close()
                for row in rows: