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()))
+ self._checknick()
watchdogtimer = MyTimer(int(self.parent.cfg.get('watchdog', 'interval', default=30)), self.watchdog)
watchdogtimer.start()
def connect(self):
self.log('!', "Connecting")
if self.conn.connect():
+ self.log('!', "Connected")
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():
numeric = pieces[0]
# dispatch dict
- dispatch = { #things to look for after source
+ dispatch = {
'NOTICE': self._gotconnected,
'001': self._got001,
'004': self._got004,
self._checknick()
def _goterror(self, pieces):
# TODO: better handling, just reconnect that single bot
- self.parent.mustquit = Exception(' '.join(pieces))
+ 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
- sys.exit(2)
+ 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()
def _write(self, line):
self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")
+ def _getsockerr(self):
+ try: # SO_ERROR might not exist on all platforms
+ return self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
+ except:
+ return None
+
def read(self):
- self.buffer += self.socket.recv(8192)
+ recvd = self.socket.recv(8192)
+ if recvd == b"":
+ raise EOFError("socket.recv returned empty", self.parent.nick, self._getsockerr())
+ self.buffer += recvd
lines = []
while b"\r\n" in self.buffer: