Fix a bug that could lose messages from the queue.

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 8d469f7da2c3b37e42be129751a863b6ccaf7b5c..3e02f9443007e9b2d07124d6f902821ff54a6102 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -15,6 +15,7 @@ if sys.version_info.major < 3:
 else:
        timerbase = threading.Timer
        stringbase = str
+
 class MyTimer(timerbase):
        def __init__(self, *args, **kwargs):
                timerbase.__init__(self, *args, **kwargs)
@@ -37,7 +38,7 @@ class Bot(object):
                self.authname = authname
                self.authpass = authpass
 
-               curs = self.parent.query("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.permnick,))
                if curs:
                        chansres = curs.fetchall()
                        curs.close()
@@ -52,12 +53,12 @@ class Bot(object):
 
                self.msgqueue = deque()
                self.slowmsgqueue = deque()
-               self.makemsgtimer()
-               self.msgtimer.start()
+               self._makemsgtimer()
+               self._msgtimer.start()
 
        def __del__(self):
                try:
-                       curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.nick,))
+                       curs = self.parent.query("UPDATE bots SET connected = 0 WHERE nick = %s", (self.permnick,))
                        curs.close()
                except: pass
 
@@ -145,7 +146,7 @@ class Bot(object):
        def _gotRegistered(self, pieces):
                self.conn.registered(True)
 
-               curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.nick,))
+               curs = self.parent.query("UPDATE bots SET connected = 1 WHERE nick = %s", (self.permnick,))
                if curs: curs.close()
 
                self.conn.send("MODE %s +x" % (pieces[2]))
@@ -235,10 +236,13 @@ class Bot(object):
        def _gotnick(self, pieces):
                oldnick = pieces[0].split('!')[0][1:]
                newnick = pieces[2][1:]
-               if newnick.lower() != oldnick.lower():
-                       self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
-                       del self.parent.users[oldnick.lower()]
-               self.parent.users[newnick.lower()].nickchange(newnick)
+               if oldnick == self.nick:
+                       self.nick = newnick
+               else:
+                       if newnick.lower() != oldnick.lower():
+                               self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
+                               del self.parent.users[oldnick.lower()]
+                       self.parent.users[newnick.lower()].nickchange(newnick)
        def _gotmode(self, pieces):
                source = pieces[0].split('!')[0][1:]
                chan = pieces[2]
@@ -318,8 +322,8 @@ class Bot(object):
                                        for callback in self.parent.getchanhook(target.lower()):
                                                try:
                                                        cbret = callback(self, user, chan, *pieces)
-                                               except NotImplementedError:
-                                                       self.msg(user, "Command not implemented.")
+                                                       if isinstance(cbret, stringbase):
+                                                               self.reply(target, user, cbret)
                                                except:
                                                        self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
                                                        self.__debug_cbexception("chanhook", user=user, target=target, msg=msg)
@@ -339,12 +343,8 @@ class Bot(object):
                                        rancmd = True
                                        try:
                                                cbret = callback(self, user, chan, target, *pieces[1:])
-                                               if cbret is NotImplemented:
-                                                       raise NotImplementedError
-                                               elif isinstance(cbret, stringbase):
+                                               if isinstance(cbret, stringbase):
                                                        self.reply(target, user, cbret)
-                                       except NotImplementedError:
-                                               self.msg(user, "Command not implemented.")
                                        except Exception:
                                                self.msg(user, "Command failed. Code: CBEXC%09.3f" % (time.time() % 100000))
                                                self.__debug_cbexception("hook", user=user, target=target, msg=msg)
@@ -427,29 +427,34 @@ class Bot(object):
                return command
 
        def _popmsg(self):
-               self.makemsgtimer()
+               self._makemsgtimer()
                self.conn.bytessent -= self.conn.recvq/3
                if self.conn.bytessent < 0: self.conn.bytessent = 0
-               self.conn.exceeded = False
+               self.conn.exceeded = True
 
+               cmd = None
                try:
                        cmd = self.msgqueue.popleft()
-                       if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq:
-                               self.conn.send(cmd)
-                               self.conn.exceeded = True
-                       else: raise IndexError
                except IndexError:
                        try:
                                cmd = self.slowmsgqueue.popleft()
-                               if not self.conn.exceeded and self.conn.bytessent+len(cmd) < self.conn.recvq:
-                                       self.conn.send(cmd)
-                                       self.conn.exceeded = True
                        except IndexError:
                                pass
-               self.msgtimer.start()
 
-       def makemsgtimer(self):
-               self.msgtimer = MyTimer(3, self._popmsg)
+               if cmd is not None:
+                       if self.conn.bytessent+len(cmd) > self.conn.recvq: # If it's too long
+                               if len(cmd) > self.conn.recvq: # Is the command itself somehow over max length???
+                                       self._msgtimer.start()
+                                       raise ValueError('Somehow a command that was too long made it into the message queue. Uhoh!', cmd)
+                                       # Discard the message.
+                               self.msgqueue.appendleft(cmd) # Phew, we've just sent too much recently. Put it (back) on the (primary) queue.
+                       else:
+                               self.conn.send(cmd)
+
+               self._msgtimer.start()
+
+       def _makemsgtimer(self):
+               self._msgtimer = MyTimer(3, self._popmsg)
 
        def join(self, chan):
                self.conn.send("JOIN %s" % (chan))
@@ -466,7 +471,7 @@ class Bot(object):
 class BotConnection(object):
        def __init__(self, parent, bind, server, port):
                self.parent = parent
-               self.buffer = bytearray(8192)
+               self.buffer = bytearray()
                self.socket = None
 
                self.bind = bind