Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/77669
Change subject: mod. rename broker target for requests - there will be multiple
......................................................................
mod. rename broker target for requests - there will be multiple
Change-Id: I477f40538b5b9f3f4fa3b58bff139d01def95a87
---
M user_metrics/api/__init__.py
M user_metrics/api/engine/request_manager.py
M user_metrics/api/views.py
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/69/77669/1
diff --git a/user_metrics/api/__init__.py b/user_metrics/api/__init__.py
index 242a073..2a91f8e 100644
--- a/user_metrics/api/__init__.py
+++ b/user_metrics/api/__init__.py
@@ -10,7 +10,7 @@
from multiprocessing import Lock
from user_metrics.api.broker import FileBroker
-BROKER_TARGET = 'broker.txt'
+REQUEST_BROKER_TARGET = 'broker.txt'
umapi_broker_context = FileBroker()
query_mod = nested_import(settings.__query_module__)
diff --git a/user_metrics/api/engine/request_manager.py
b/user_metrics/api/engine/request_manager.py
index 2472f3c..c7d5297 100644
--- a/user_metrics/api/engine/request_manager.py
+++ b/user_metrics/api/engine/request_manager.py
@@ -83,7 +83,7 @@
from user_metrics.config import logging, settings
from user_metrics.api import MetricsAPIError, error_codes, query_mod, \
- REQ_NCB_LOCK, REQUEST_PATH, BROKER_TARGET, umapi_broker_context
+ REQ_NCB_LOCK, REQUEST_PATH, REQUEST_BROKER_TARGET, umapi_broker_context
from user_metrics.api.engine.data import get_users, get_url_from_keys, \
build_key_signature
from user_metrics.api.engine.request_meta import rebuild_unpacked_request
@@ -151,7 +151,7 @@
# Request Queue Processing
# ------------------------
- req_item = umapi_broker_context.pop(BROKER_TARGET)
+ req_item = umapi_broker_context.pop(REQUEST_BROKER_TARGET)
logging.debug(log_name + ' :: PULLING item from request queue -> ' \
'\n\tCOHORT = {0} - METRIC = {1}'
diff --git a/user_metrics/api/views.py b/user_metrics/api/views.py
index 914ea56..05952a3 100644
--- a/user_metrics/api/views.py
+++ b/user_metrics/api/views.py
@@ -24,7 +24,7 @@
from user_metrics.api.engine.data import get_cohort_refresh_datetime, \
get_data, get_url_from_keys, build_key_signature, read_pickle_data
from user_metrics.api import MetricsAPIError, error_codes, query_mod, \
- REQ_NCB_LOCK, BROKER_TARGET, umapi_broker_context
+ REQ_NCB_LOCK, REQUEST_BROKER_TARGET, umapi_broker_context
from user_metrics.api.engine.request_meta import filter_request_input, \
format_request_params, RequestMetaFactory, \
get_metric_names
@@ -454,7 +454,7 @@
# Add the request to the queue
else:
hash = sha1(request.url.encode('utf-8')).hexdigest()
- umapi_broker_context.add(BROKER_TARGET, hash, request.url)
+ umapi_broker_context.add(REQUEST_BROKER_TARGET, hash, request.url)
return render_template('processing.html', url_str=str(rm))
--
To view, visit https://gerrit.wikimedia.org/r/77669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I477f40538b5b9f3f4fa3b58bff139d01def95a87
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
