You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by na...@apache.org on 2018/03/19 19:28:44 UTC
[35/42] incubator-spot git commit: PEP8 proxy_parser()
PEP8 proxy_parser()
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/b9befd7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/b9befd7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/b9befd7b
Branch: refs/heads/SPOT-181_ODM
Commit: b9befd7b0a882a327c31a691a57c07a86a64ff31
Parents: 8ff0e47
Author: tpltnt <tp...@dropcut.net>
Authored: Thu Jan 25 11:45:07 2018 +0100
Committer: tpltnt <tp...@dropcut.net>
Committed: Thu Jan 25 11:45:07 2018 +0100
----------------------------------------------------------------------
spot-ingest/pipelines/proxy/bluecoat.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/b9befd7b/spot-ingest/pipelines/proxy/bluecoat.py
----------------------------------------------------------------------
diff --git a/spot-ingest/pipelines/proxy/bluecoat.py b/spot-ingest/pipelines/proxy/bluecoat.py
index 5667204..c2ddb04 100644
--- a/spot-ingest/pipelines/proxy/bluecoat.py
+++ b/spot-ingest/pipelines/proxy/bluecoat.py
@@ -118,25 +118,32 @@ def proxy_parser(proxy_fields):
Parse and normalize data.
:param proxy_fields: list with fields from log
- :returns: list of str
+ :returns: list
"""
proxy_parsed_data = []
if len(proxy_fields) > 1:
# create full URI.
- proxy_uri_path = proxy_fields[17] if len(proxy_fields[17]) > 1 else ""
- proxy_uri_qry = proxy_fields[18] if len(proxy_fields[18]) > 1 else ""
- full_uri= "{0}{1}{2}".format(proxy_fields[15],proxy_uri_path,proxy_uri_qry)
+ proxy_uri_path = proxy_fields[17] if len(proxy_fields[17]) > 1 else ""
+ proxy_uri_qry = proxy_fields[18] if len(proxy_fields[18]) > 1 else ""
+ full_uri = "{0}{1}{2}".format(proxy_fields[15], proxy_uri_path, proxy_uri_qry)
date = proxy_fields[0].split('-')
- year = date[0]
+ year = date[0]
month = date[1].zfill(2)
day = date[2].zfill(2)
hour = proxy_fields[1].split(":")[0].zfill(2)
- # re-order fields.
- proxy_parsed_data = [proxy_fields[0],proxy_fields[1],proxy_fields[3],proxy_fields[15],proxy_fields[12],proxy_fields[20],proxy_fields[13],int(proxy_fields[2]),proxy_fields[4],
- proxy_fields[5],proxy_fields[6],proxy_fields[7],proxy_fields[8],proxy_fields[9],proxy_fields[10],proxy_fields[11],proxy_fields[14],proxy_fields[16],proxy_fields[17],proxy_fields[18],
- proxy_fields[19],proxy_fields[21],int(proxy_fields[22]),int(proxy_fields[23]),proxy_fields[24],proxy_fields[25],proxy_fields[26],full_uri,year,month,day,hour ]
+ # re-order fields.
+ proxy_parsed_data = [proxy_fields[0], proxy_fields[1], proxy_fields[3],
+ proxy_fields[15], proxy_fields[12], proxy_fields[20],
+ proxy_fields[13], int(proxy_fields[2]), proxy_fields[4],
+ proxy_fields[5], proxy_fields[6], proxy_fields[7],
+ proxy_fields[8], proxy_fields[9], proxy_fields[10],
+ proxy_fields[11], proxy_fields[14], proxy_fields[16],
+ proxy_fields[17], proxy_fields[18], proxy_fields[19],
+ proxy_fields[21], int(proxy_fields[22]), int(proxy_fields[23]),
+ proxy_fields[24], proxy_fields[25], proxy_fields[26],
+ full_uri, year, month, day, hour]
return proxy_parsed_data