From 5ab2dc0ac9c2286a8cd94bb2b3aaf997d29cb5b5 Mon Sep 17 00:00:00 2001
From: Andrea Pavone <info@andreapavone.com>
Date: Tue, 20 Oct 2020 23:44:50 +0200
Subject: [PATCH 1/2] test issue with plesk error log

---
 src/modsec_log_parser.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modsec_log_parser.py b/src/modsec_log_parser.py
index d571b24..fe5f5f8 100644
--- a/src/modsec_log_parser.py
+++ b/src/modsec_log_parser.py
@@ -15,21 +15,20 @@
 
 
 """
-
+from . log_entry import LogEntry
 import fileinput
-from log_entry import LogEntry
+
 
 class ModSecLogParser:
-    def __init__(self, watch = None): 
+    def __init__(self, watch=None):
         self.watch = watch
         self.logs = []
 
     def run(self):
-	for line in fileinput.input(self.watch):
-            l = LogEntry(string = line)
-            self.logs.append(l)
+        for line in fileinput.input(self.watch):
+            log = LogEntry(string=line)
+            self.logs.append(log)
         return self.logs
-
         self.sumarize()
 
 

From da3497975ab6239d2f57d3726d709a0924cf8315 Mon Sep 17 00:00:00 2001
From: Andrea Pavone <info@andreapavone.com>
Date: Thu, 22 Oct 2020 23:36:43 +0200
Subject: [PATCH 2/2] Bug Fix for Python 3.8

---
 modsec-log-parser.py | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/modsec-log-parser.py b/modsec-log-parser.py
index ab5e800..35ca7e8 100755
--- a/modsec-log-parser.py
+++ b/modsec-log-parser.py
@@ -17,7 +17,6 @@
 
 """
 
-
 from src.modsec_log_parser import ModSecLogParser
 import argparse
 
@@ -33,35 +32,33 @@ def main():
     files = args.files
     summary = args.summary
     delim = args.delim
-    if len(files) == 0:
+    if files is None or len(files) == 0:
         files = "/dev/stdin"
-    if len(summary) == 0:
+    if summary is None or len(summary) == 0:
         summary = "id,msg"
 
     msclp = ModSecLogParser(files)
     data = msclp.run()
 
     ar = {}
-    if data == None:
+    if data is None:
         return
 
     for i in data:
         z = ""
-	for xx in summary.split(","):
+        for xx in summary.split(","):
             if len(z) > 0:
-                z = z + str(delim) 
+                z = z + str(delim)
             z = z + str(i.__dict__[xx])
 
-	if i.id in ar:
-	    ar[z] = ar[str(i.id)] + 1
-	else:
-	    ar[z] = 1
-
+        if i.id in ar:
+            ar[z] = ar[str(i.id)] + 1
+        else:
+            ar[z] = 1
 
     for i in ar:
-	print str(i)
-
-if __name__=="__main__":
-    main()
+        print(str(i))
 
 
+if __name__ == "__main__":
+    main()