Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78206
Change subject: mod. build_request_obj to accept url and request object
template separately.
......................................................................
mod. build_request_obj to accept url and request object template separately.
Change-Id: If960163f1de1f3a8629077adee465ea2e79d3887
---
M user_metrics/api/engine/data.py
M user_metrics/api/engine/request_meta.py
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/06/78206/1
diff --git a/user_metrics/api/engine/data.py b/user_metrics/api/engine/data.py
index 6165ef9..f73c94d 100644
--- a/user_metrics/api/engine/data.py
+++ b/user_metrics/api/engine/data.py
@@ -91,7 +91,7 @@
is successfully recovered data is returned
"""
- request_obj = build_request_obj(request)
+ request_obj = build_request_obj(request, request.url)
hash_table_ref = read_pickle_data()
# Traverse the hash key structure to find data
diff --git a/user_metrics/api/engine/request_meta.py
b/user_metrics/api/engine/request_meta.py
index 931f60a..fbca268 100644
--- a/user_metrics/api/engine/request_meta.py
+++ b/user_metrics/api/engine/request_meta.py
@@ -117,7 +117,7 @@
return eval('rt' + arg_str)
-def build_request_obj(request):
+def build_request_obj(request_obj_raw, request_url):
"""
Build a request and validate.
@@ -127,7 +127,7 @@
4. See if this maps to a single user request
"""
- parsed_req = parse_raw_request(request.url)
+ parsed_req = parse_raw_request(request_url)
# Get the refresh date of the cohort
try:
@@ -141,7 +141,7 @@
rm = RequestMetaFactory(parsed_req.cohort, cohort_refresh_ts,
parsed_req.metric)
- filter_request_input(request, rm)
+ filter_request_input(request_obj_raw, rm)
format_request_params(rm)
if rm.is_user:
--
To view, visit https://gerrit.wikimedia.org/r/78206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If960163f1de1f3a8629077adee465ea2e79d3887
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
