Skip to content

Update the regex rule in Python example Chapter 1 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update the regex rule in Python example Chapter 1 #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d666a10
Update the regex rule
astroyang Mar 21, 2016
231652c
Merge pull request #1 from astroyang/python-regex-patch-1
astroyang Mar 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions logs_analyzer/chapter1/python/databricks/apps/logs/apache_access_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

from pyspark.sql import Row

# The last item, content size, could be 0, represented either as '0' or '-'
# For the log from http://www.monitorware.com/en/logsamples/apache.php
# Still there is one line that does not conform.
# To save time I just delete that line of log for this tutorial.

APACHE_ACCESS_LOG_PATTERN = '^(\S+) (\S+) (\S+) \[([\w:/]+\s[+\-]\d{4})\] "(\S+) (\S+) (\S+)" (\d{3}) (\d+)'
APACHE_ACCESS_LOG_PATTERN = '^(\S+) (\S+) (\S+) \[([\w:/]+\s[+\-]\d{4})\] "(\S+) (\S+) (\S+)" (\d{3}) (\d+|-)'

# Returns a dictionary containing the parts of the Apache Access Log.
def parse_apache_log_line(logline):
match = re.search(APACHE_ACCESS_LOG_PATTERN, logline)
if match is None:
if match is None:
raise Error("Invalid logline: %s" % logline)
else:
val = long(match.group(9)) if match.group(9)!='-' else 0
return Row(
ip_address = match.group(1),
client_identd = match.group(2),
Expand All @@ -19,5 +25,5 @@ def parse_apache_log_line(logline):
endpoint = match.group(6),
protocol = match.group(7),
response_code = int(match.group(8)),
content_size = long(match.group(9))
content_size = val
)