Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78839
Change subject: mod. refactor job_queue views to utilize brokers.
......................................................................
mod. refactor job_queue views to utilize brokers.
Change-Id: I9556b2c019099d88b43849e2f3fd027c3496a922
---
M user_metrics/api/views.py
1 file changed, 22 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/39/78839/1
diff --git a/user_metrics/api/views.py b/user_metrics/api/views.py
index 021056b..5419a25 100644
--- a/user_metrics/api/views.py
+++ b/user_metrics/api/views.py
@@ -425,33 +425,35 @@
error = get_errors(request.args)
p_list = list()
- p_list.append(Markup('<thead><tr><th>is_alive</th><th>url'
+ p_list.append(Markup('<thead><tr><th>state</th><th>url'
'</th></tr></thead>\n<tbody>\n'))
- # Get keys from broker target
-
- umapi_broker_context.add(REQUEST_BROKER_TARGET, url_hash, request.url)
-
+ # Get keys from broker targets
items_req = umapi_broker_context.get_all_itmes(REQUEST_BROKER_TARGET)
items_res = umapi_broker_context.get_all_itmes(RESPONSE_BROKER_TARGET)
items_proc = umapi_broker_context.get_all_itmes(PROCESS_BROKER_TARGET)
- keys = []
- for key in keys:
- # Log the status of the job
- # TODO this will be part of the broker data
- url = ''
- is_alive = False
+ logging.info(str(items_req))
+ logging.info(str(items_res))
+ logging.info(str(items_proc))
- p_list.append('<tr><td>')
- response_url = "".join(['<a href="',
- request.url_root,
- url + '">', url, '</a>'])
- p_list.append("</td><td>".join([is_alive,
- escape(Markup(response_url)),
- ]))
- p_list.append(Markup('</td></tr>'))
- p_list.append(Markup('\n</tbody>'))
+ for item in items_req:
+ url = item[item.keys()[0]]
+ row_markup = '<tr><td>{0}</td><td><a href="{1}">{2}</a></td></tr>'\
+ .format('request pending', url, url)
+ p_list.append(Markup(row_markup))
+
+ for item in items_req:
+ url = item[item.keys()[0]]
+ row_markup = '<tr><td>{0}</td><td><a href="{1}">{2}</a></td></tr>'\
+ .format('response generating', url, url)
+ p_list.append(Markup(row_markup))
+
+ for item in items_proc:
+ url = item[item.keys()[0]]
+ row_markup = '<tr><td>{0}</td><td><a href="{1}">{2}</a></td></tr>'\
+ .format('processing', url, url)
+ p_list.append(Markup(row_markup))
if error:
return render_template('queue.html', procs=p_list, error=error)
--
To view, visit https://gerrit.wikimedia.org/r/78839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9556b2c019099d88b43849e2f3fd027c3496a922
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <rfaulk...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
