fix attempting to regain original nick when nick was in use upon connect

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 157b0901dba09cc9f17c4ea9fae0fce143acd199..b0aec1bc6fb17c8bb850d81c4eb0eed537d88fe0 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -69,7 +69,11 @@ class Bot(object):
        def watchdog(self):
                if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
                        self.parse("ERROR :Fake-error from watchdog timer.")
-               self.watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
+               if self.conn.registered():
+                       self.conn.send("PING :%s" % (time.time()))
+                       self._checknick()
+               watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
+               watchdogtimer.start()
 
        def log(self, *args, **kwargs):
                self.parent.log(self.nick, *args, **kwargs)
@@ -80,8 +84,12 @@ class Bot(object):
                        self.parent.newfd(self, self.conn.socket.fileno())
 
        def getdata(self):
-               self.lastreceived = time.time()
-               return self.conn.read()
+               try:
+                       recvd = self.conn.read()
+                       self.lastreceived = time.time()
+                       return recvd
+               except EOFError as e:
+                       return ":%s ERROR :%s%r" % (self.nick, e.__class__.__name__, e.args)
 
        def _checknick(self): # check if we're using the right nick, try changing
                if self.nick != self.permnick and self.conn.registered():
@@ -98,7 +106,7 @@ class Bot(object):
                        numeric = pieces[0]
 
                # dispatch dict
-               dispatch = { #things to look for after source
+               dispatch = {
                        'NOTICE': self._gotconnected,
                        '001': self._got001,
                        '004': self._got004,
@@ -138,14 +146,19 @@ class Bot(object):
                self._checknick()
        def _goterror(self, pieces):
                # TODO: better handling, just reconnect that single bot
+               error = ' '.join(pieces)
+               try:
+                       raise Exception(error)
+               except Exception as e:
+                       self.parent.mustquit = e
                try:
-                       self.quit("Error detected: %s" % ' '.join(pieces))
+                       self.quit("Error detected: %s" % (error))
                except: pass
                try:
                        curs = self.parent.query("UPDATE bots SET connected = 0")
                        curs.close()
                except: pass
-               os._exit(2) # can't use sys.exit since we might be in a sub-thread
+               self.log('!', 'Bot exiting due to: %s' % (error))
        def _got001(self, pieces):
                # We wait until the end of MOTD instead to consider ourselves registered, but consider uptime as of 001
                self.connecttime = time.time()
@@ -364,6 +377,7 @@ 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:
+                                               self.parent.mustquit = e
                                                try:
                                                        curs = self.parent.query("UPDATE bots SET connected = 0")
                                                        curs.close()
@@ -545,7 +559,10 @@ class BotConnection(object):
                self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")
 
        def read(self):
-               self.buffer += self.socket.recv(8192)
+               recvd = self.socket.recv(8192)
+               if recvd == "":
+                       raise EOFError("socket.recv in %s returned empty" % (self.parent.nick))
+               self.buffer += recvd
                lines = []
 
                while b"\r\n" in self.buffer: