diff options
| -rw-r--r-- | src/IRCBot.py | 7 | ||||
| -rw-r--r-- | src/IRCServer.py | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/IRCBot.py b/src/IRCBot.py index 4a69afd1..53721dff 100644 --- a/src/IRCBot.py +++ b/src/IRCBot.py @@ -211,21 +211,18 @@ class Bot(object): continue for piece in data: - if irc: - self.log.debug("%s (raw) | %s", - [str(sock), piece]) sock.parse_data(piece) elif event & select.EPOLLOUT: sock._send() if sock.fileno() in self.servers: self.register_read(sock) elif event & select.EPULLHUP: - print("hangup") + self.log.info("Recieved EPOLLHUP for %s", [str(sock)]) sock.disconnect() for server in list(self.servers.values()): if server.read_timed_out(): - print("pingout from %s" % str(server)) + self.log.info("Pinged out from %s", [str(server)]) server.disconnect() elif server.ping_due() and not server.ping_sent: server.send_ping() diff --git a/src/IRCServer.py b/src/IRCServer.py index eb8922f4..88c47b07 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -223,6 +223,8 @@ class Server(IRCObject.Object): def parse_data(self, line: str): if not line: return + + self.bot.log.debug("%s (raw recv) | %s", [str(self), line]) self.events.on("raw.received").call_unsafe(server=self, line=line) self.check_users() def check_users(self): @@ -285,16 +287,16 @@ class Server(IRCObject.Object): def read_timed_out(self) -> bool: return self.until_read_timeout == 0 - def send(self, data: str): + def send(self, line: str): returned = self.events.on("preprocess.send").call_unsafe_for_result( server=self, line=data) - line = returned or data + line = returned or line encoded = line.split("\n")[0].strip("\r").encode("utf8") if len(encoded) > 450: encoded = encoded[:450] self.buffered_lines.append(encoded + b"\r\n") - self.bot.log.debug(">%s | %s", [str(self), encoded.decode("utf8")]) + self.bot.log.debug("%s (raw send) | %s", [str(self), line]) def _send(self): if not len(self.write_buffer): |