try to make more robust in connection faults

diff --git a/bot.py b/bot.py
index 9fe18abdf644ca8ad67231d1ff3dcf1f81930728..451786b6eff0cf8e2722989afc8d79fcdfc0da56 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -67,8 +67,10 @@ class Bot(object):
                except: pass
 
        def watchdog(self):
-               if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=600))+self.lastreceived:
+               if time.time() > int(self.parent.cfg.get('watchdog', 'maxtime', default=300))+self.lastreceived:
                        self.parse("ERROR :Fake-error from watchdog timer.")
+               if self.conn.registered():
+                       self.conn.send("PING :%s" % (time.time()))
                watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
                watchdogtimer.start()
 
@@ -81,8 +83,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():
@@ -99,7 +105,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,
@@ -548,7 +554,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: