From 20f19c696b847a5060c7751fccaecd180e1fff0d Mon Sep 17 00:00:00 2001 From: Katarina Durechova Date: Wed, 24 Sep 2014 15:43:33 +0100 Subject: [PATCH 1/2] Create textlog session id from peerIP and peerPort because both textlog and mysql log create their own session id, so session id can not be used to search data in mysql db. This way, there will be usefil data in textlog session id. --- kippo/dblog/textlog.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kippo/dblog/textlog.py b/kippo/dblog/textlog.py index 383cef7..34c1388 100644 --- a/kippo/dblog/textlog.py +++ b/kippo/dblog/textlog.py @@ -8,7 +8,6 @@ from twisted.internet import defer from twisted.python import log import time -import uuid class DBLogger(dblog.DBLogger): def start(self, cfg): @@ -20,10 +19,7 @@ def write(self, session, msg): self.outfile.flush() def createSession(self, peerIP, peerPort, hostIP, hostPort): - sid = uuid.uuid1().hex - sensorname = self.getSensor() or hostIP - self.write(sid, 'New connection: %s:%s' % (peerIP, peerPort)) - return sid + return format(peerIP) + " " + format(peerPort) def handleConnectionLost(self, session, args): self.write(session, 'Connection lost') From 686f24216385772122640080ce8dfa21f1043fe1 Mon Sep 17 00:00:00 2001 From: Katarina Durechova Date: Thu, 9 Oct 2014 16:28:00 +0100 Subject: [PATCH 2/2] Remove not used modules from textlog --- kippo/dblog/textlog.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/kippo/dblog/textlog.py b/kippo/dblog/textlog.py index 34c1388..deb525a 100644 --- a/kippo/dblog/textlog.py +++ b/kippo/dblog/textlog.py @@ -4,9 +4,6 @@ # from kippo.core import dblog -from twisted.enterprise import adbapi -from twisted.internet import defer -from twisted.python import log import time class DBLogger(dblog.DBLogger):