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() 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()