Rfaulk has submitted this change and it was merged.
Change subject: mod. reconstruct response from job queue.
......................................................................
mod. reconstruct response from job queue.
Change-Id: I4f255f9121366706ca4ce41c15cbea730e620408
---
M user_metrics/api/engine/request_manager.py
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
diff --git a/user_metrics/api/engine/request_manager.py
b/user_metrics/api/engine/request_manager.py
index 7eeb12c..cdbcba2 100644
--- a/user_metrics/api/engine/request_manager.py
+++ b/user_metrics/api/engine/request_manager.py
@@ -164,12 +164,21 @@
for job_item in job_queue:
- umapi_broker_context.add(RESPONSE_BROKER_TARGET, job_item.request)
- del job_queue[job_queue.index(job_item)]
- concurrent_jobs -= 1
- logging.debug(log_name + ' :: RUN -> RESPONSE - Job ID {0}'\
- '\n\tConcurrent jobs = {1}'
- .format(str(job_item.id), concurrent_jobs))
+ if not job_item.queue.empty():
+
+ # Pull data off of the queue and add it to response queue
+ data = ''
+ while not job_item.queue.empty():
+ data += job_item.queue.get(True)
+
+ # Put the response strinf
+ umapi_broker_context.add(RESPONSE_BROKER_TARGET,
[job_item.request, data])
+
+ del job_queue[job_queue.index(job_item)]
+ concurrent_jobs -= 1
+ logging.debug(log_name + ' :: RUN -> RESPONSE - Job ID {0}'\
+ '\n\tConcurrent jobs = {1}'
+ .format(str(job_item.id), concurrent_jobs))
# Process request
# ---------------
--
To view, visit https://gerrit.wikimedia.org/r/77680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f255f9121366706ca4ce41c15cbea730e620408
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
