From 5e0d206e7abf022f77ae59cbb01a98bf93634f3a Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Tue, 22 Nov 2022 13:18:08 -0800 Subject: [PATCH] minor cleanup --- jc/parsers/clf.py | 4 ++-- jc/parsers/clf_s.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jc/parsers/clf.py b/jc/parsers/clf.py index 4273445c..64e942d0 100644 --- a/jc/parsers/clf.py +++ b/jc/parsers/clf.py @@ -282,8 +282,8 @@ def parse( if clf_match: output_line = clf_match.groupdict() - if clf_match.groupdict().get('request', None): - request_string = clf_match.groupdict()['request'] + if output_line.get('request', None): + request_string = output_line['request'] request_match = re.match(request_pattern, request_string) if request_match: output_line.update(request_match.groupdict()) diff --git a/jc/parsers/clf_s.py b/jc/parsers/clf_s.py index 6fc08313..4e16c98b 100644 --- a/jc/parsers/clf_s.py +++ b/jc/parsers/clf_s.py @@ -205,8 +205,8 @@ def parse( if clf_match: output_line = clf_match.groupdict() - if clf_match.groupdict().get('request', None): - request_string = clf_match.groupdict()['request'] + if output_line.get('request', None): + request_string = output_line['request'] request_match = re.match(request_pattern, request_string) if request_match: output_line.update(request_match.groupdict()) @@ -217,7 +217,7 @@ def parse( if output_line: yield output_line if raw else _process(output_line) else: - raise ParseError('Not clf data') + raise ParseError('Not Common Log Format data') except Exception as e: yield raise_or_yield(ignore_exceptions, e, line)