fix SQL auto-retry

diff --git a/bot.py b/bot.py
index 8c8f4b540fd44e03cc4c3a7aaeba3dd2617c2884..f0be0b52f26e912c7e0a44c49fd46d19b103ce35 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -24,8 +24,8 @@ class Bot(object):
                self.authname = authname
                self.authpass = authpass
 
-               curs = self.parent.db.cursor()
-               if curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)):
+               curs = self.parent.query("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,))
+               if curs:
                        chansres = curs.fetchall()
                        curs.close()
                        self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
@@ -43,9 +43,10 @@ class Bot(object):
                self.msgtimer.start()
 
        def __del__(self):
-               curs = self.parent.db.cursor()
-               curs.execute("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
-               curs.close()
+               try:
+                       curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
+                       curs.close()
+               except: pass
 
        def watchdog(self):
                if time.time() > self.parent.cfg.get('watchdog', 'maxtime', default=300)+self.lastreceived:
@@ -113,11 +114,11 @@ class Bot(object):
                self.conn.send("PONG %s" % (pieces[1]))
                self._checknick()
        def _goterror(self, pieces):
-               try: self.quit("Error detected: %s" % ' '.join(pieces))
+               try:
+                       self.quit("Error detected: %s" % ' '.join(pieces))
+                       curs = self.parent.query("UPDATE bots SET connected = 0")
+                       curs.close()
                except: pass
-               curs = self.parent.db.cursor()
-               curs.execute("UPDATE bots SET connected = 0")
-               curs.close()
                sys.exit(2)
                os._exit(2)
        def _got001(self, pieces):
@@ -125,9 +126,8 @@ class Bot(object):
        def _gotRegistered(self, pieces):
                self.conn.registered(True)
 
-               curs = self.parent.db.cursor()
-               curs.execute("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
-               curs.close()
+               curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
+               if curs: curs.close()
 
                self.conn.send("MODE %s +x" % (pieces[2]))
                if self.authname is not None and self.authpass is not None:
@@ -322,9 +322,10 @@ class Bot(object):
                                                self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
                                                self.__debug_cbexception("hook", user=user, target=target, msg=msg)
                                        except SystemExit as e:
-                                               curs = self.parent.db.cursor()
-                                               curs.execute("UPDATE bots SET connected = 0")
-                                               curs.close()
+                                               try:
+                                                       curs = self.parent.query("UPDATE bots SET connected = 0")
+                                                       curs.close()
+                                               except: pass
                                                raise e
                else:
                        rancmd = True

diff --git a/erebus.py b/erebus.py
index 90e13898fe077e47167360f4b80d4c17ac7144a7..76320d6c802297f06cd34fdf76ebd3b7f7138707 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -45,8 +45,8 @@ class Erebus(object): #singleton to pass around
                        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): #singleton to pass around
                        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): #singleton to pass around
                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): #singleton to pass around
                        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)
@@ -251,30 +274,9 @@ class Erebus(object): #singleton to pass around
                return self.chanhandlers[chan]
 
 
-class MyCursor(MySQLdb.cursors.DictCursor):
-       def execute(self, *args, **kwargs):
-               if 'norecurse' in kwargs:
-                       norecurse = kwargs['norecurse']
-                       del kwargs['norecurse']
-               else:
-                       norecurse = False
-               main.log("[SQL]", "?", "MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in 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:
-                       return super(self.__class__, self).execute(*args, **kwargs)
-               except MySQLdb.MySQLError as e:
-                       main.log("[SQL]", "!", "MySQL error! %r" % (e))
-#                      print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
-                       if not norecurse:
-                               dbsetup()
-                               return self.execute(norecurse=True, *args, **kwargs)
-                       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
@@ -295,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: