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)
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():
self.log('I', line)
pieces = line.split()
+ if pieces[0][0] == ":":
+ numeric = pieces[1]
+ else:
+ numeric = pieces[0]
+
# dispatch dict
- zero = { #things to look for without source
- 'NOTICE': self._gotconnected,
- 'PING': self._gotping,
- 'ERROR': self._goterror,
- }
- one = { #things to look for after source
+ dispatch = {
'NOTICE': self._gotconnected,
'001': self._got001,
'004': self._got004,
'QUIT': self._gotquit,
'NICK': self._gotnick,
'MODE': self._gotmode,
+ 'PING': self._gotping,
+ 'ERROR': self._goterror,
}
- if self.parent.hasnumhook(pieces[1]):
- hooks = self.parent.getnumhook(pieces[1])
+ if self.parent.hasnumhook(numeric):
+ hooks = self.parent.getnumhook(numeric)
for callback in hooks:
try:
callback(self, line)
except Exception:
self.__debug_cbexception("numhook", line)
- if pieces[0] in zero:
- zero[pieces[0]](pieces)
- elif pieces[1] in one:
- one[pieces[1]](pieces)
+ if numeric in dispatch:
+ dispatch[numeric](pieces)
def _gotconnected(self, pieces):
if not self.conn.registered():
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
- sys.exit(2)
- os._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()
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()
In the case of fastmsg, self.conn.exceeded may be True, however, in this case append_callback=self.conn.send, so it will still be sent immediately.
"""
def _msg(self, target, msg, truncate, append_callback, msgtype):
- if self.parent.cfg.getboolean('erebus', 'nofakelag'): return self.fastmsg(target, msg)
+ if self.parent.cfg.getboolean('erebus', 'nofakelag'): append_callback = self.conn.send
cmd = self._formatmsg(target, msg, msgtype)
# The max length is much shorter than recvq (510) because of the length the server adds on about the source (us).
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: