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 recvd
except EOFError as e:
- return ":%s ERROR :%s%r" % (self.nick, e.__class__.__name__, e.args)
+ 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():
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):
recvd = self.socket.recv(8192)
- if recvd == "":
- raise EOFError("socket.recv in %s returned empty" % (self.parent.nick))
+ if recvd == b"":
+ raise EOFError("socket.recv returned empty", self.parent.nick, self._getsockerr())
self.buffer += recvd
lines = []