self.parent.log(self.nick, *args, **kwargs)
def connect(self):
+ self.log('!', "Connecting")
if self.conn.connect():
self.parent.newfd(self, self.conn.socket.fileno())
'ERROR': self._goterror,
}
one = { #things to look for after source
+ 'NOTICE': self._gotconnected,
'001': self._got001,
'376': self._gotRegistered,
'422': self._gotRegistered,
self.conn.send("PONG %s" % (pieces[1]))
self._checknick()
def _goterror(self, pieces):
+ # TODO: better handling, just reconnect that single bot
try:
self.quit("Error detected: %s" % ' '.join(pieces))
+ except: pass
+ try:
curs = self.parent.query("UPDATE bots SET connected = 0")
curs.close()
except: pass
if cbret is NotImplemented:
raise NotImplementedError
elif isinstance(cbret, stringbase):
- self.reply(chan, user, cbret)
+ self.reply(target, user, cbret)
except NotImplementedError:
self.msg(user, "Command not implemented.")
except Exception:
def reply(self, chan, user, msg):
- if chan is not None:
+ if chan is not None and (isinstance(chan, self.parent.Channel) or (isinstance(chan, stringbase) and chan[0] == "#")):
self.msg(chan, "%s: %s" % (user, msg))
else:
self.msg(user, msg)
self.msgtimer.start()
def makemsgtimer(self):
- self.msgtimer = threading.Timer(3, self._popmsg)
- self.msgtimer.daemon = True
+ self.msgtimer = MyTimer(3, self._popmsg)
def join(self, chan):
self.conn.send("JOIN %s" % (chan))
self.bytessent = 0
self.recvq = 500
self.exceeded = False
+ self._nowrite = False
def connect(self):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
return self.state == 2
def send(self, line):
- if self.parent.parent.cfg.getboolean('debug', 'io'):
- self.parent.log('O', line)
- self.bytessent += len(line)
- self._write(line)
+ if not self._nowrite:
+ if self.parent.parent.cfg.getboolean('debug', 'io'):
+ self.parent.log('O', line)
+ self.bytessent += len(line)
+ try:
+ self._write(line)
+ except socket.error as e:
+ self._nowrite = True
+ self.parent._goterror(repr(e))
+ else:
+ if self.parent.parent.cfg.getboolean('debug', 'io'):
+ self.parent.log('X', line)
def _write(self, line):
self.socket.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")