From: John Runyon <redacted>
Date: Wed, 13 Dec 2023 22:28:34 +0000 (-0700)
Subject: move responsibility for input logging to the core
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/4aa86bbb5cab8eb6a672bdff71964669450da021

move responsibility for input logging to the core
---

diff --git a/bot.py b/bot.py
index 681400f..73115a8 100644
--- a/bot.py
+++ b/bot.py
@@ -99,8 +99,6 @@ class Bot(object):
 			self.conn.send("NICK %s" % (self.permnick))
 
 	def parse(self, line):
-		if self.parent.cfg.getboolean('debug', 'io'):
-			self.log('I', line)
 		pieces = line.split()
 
 		if pieces[0][0] == ":":
diff --git a/erebus.py b/erebus.py
index c161a42..5ebb39e 100644
--- a/erebus.py
+++ b/erebus.py
@@ -379,6 +379,8 @@ def loop():
 			main.fd(fileno).close()
 		else:
 			for line in data:
+				if cfg.getboolean('debug', 'io'):
+					main.log(str(main.fd(fileno)), 'I', line)
 				try:
 					main.fd(fileno).parse(line)
 				except:
diff --git a/modules/basic_socket.py b/modules/basic_socket.py
index f81822b..1f6563d 100644
--- a/modules/basic_socket.py
+++ b/modules/basic_socket.py
@@ -64,10 +64,8 @@ class BasicServer(object):
 		return lines
 
 	def parse(self, line):
-		peer = self.sock.getpeername()
 		bot = lib.parent.randbot()
 		maxlen = bot.maxmsglen() - len("PRIVMSG  :") - len(self.chan)
-		lib.parent.log(str(self), 'I', line)
 		while len(line) > maxlen:
 			cutat = line.rfind(' ', 0, maxlen)
 			if cutat == -1:
@@ -77,6 +75,8 @@ class BasicServer(object):
 		bot.msg(self.chan, line)
 
 	def send(self, line):
+		if lib.parent.parent.cfg.getboolean('debug', 'io'):
+			lib.parent.log(str(self), 'O', line)
 		self.sock.sendall(line.encode('utf-8', 'backslashreplace')+b"\r\n")
 
 	def _getsockerr(self):