Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75607
Change subject: flake fixes and small url fix
......................................................................
flake fixes and small url fix
Change-Id: I5e4e7c8e504059940eedbe33d0d9967f780f5a48
---
M wikimetrics/controllers/jobs.py
M wikimetrics/models/job.py
M wikimetrics/templates/index.html
3 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/07/75607/1
diff --git a/wikimetrics/controllers/jobs.py b/wikimetrics/controllers/jobs.py
index c4fee2e..19366a6 100644
--- a/wikimetrics/controllers/jobs.py
+++ b/wikimetrics/controllers/jobs.py
@@ -3,7 +3,10 @@
import celery
from celery.task.control import revoke
from ..configurables import app, db
-from ..models import Cohort, CohortUser, CohortUserRole, Job, JobResponse,
PersistentJob, MultiProjectMetricJob
+from ..models import (
+ Cohort, CohortUser, CohortUserRole, Job,
+ JobResponse, PersistentJob, MultiProjectMetricJob
+)
from ..metrics import metric_classes
from ..utils import json_response, json_error, json_redirect, deduplicate
import json
@@ -68,8 +71,10 @@
name = ', '.join(metric_names) + ' for ' + ', '.join(cohort_names)
jr = JobResponse(metric_jobs, name=name)
async_response = jr.task.delay()
- app.logger.info('starting job with celery_id: %s, PersistentJob.id:
%d',\
- async_response.task_id, jr.persistent_id)
+ app.logger.info(
+ 'starting job with celery_id: %s, PersistentJob.id: %d',
+ async_response.task_id, jr.persistent_id
+ )
#return render_template('jobs.html')
return json_redirect(url_for('jobs_index'))
@@ -141,6 +146,7 @@
db_session.close()
return response
+
@app.route('/jobs/result/<job_id>.json')
def job_result_json(job_id):
response = ''
@@ -161,6 +167,7 @@
db_session.close()
return response
+
@app.route('/jobs/kill/<job_id>')
def job_kill(job_id):
db_session = db.get_session()
diff --git a/wikimetrics/models/job.py b/wikimetrics/models/job.py
index 3f1dc5e..7fd3c07 100644
--- a/wikimetrics/models/job.py
+++ b/wikimetrics/models/job.py
@@ -53,8 +53,6 @@
# if we don't have the result key leave as is (PENDING)
if self.result_key and self.status not in (celery.states.READY_STATES):
celery_task = Job.task.AsyncResult(self.result_key)
- print celery_task
- print 'status is {0}, ready is {1}, result is {2}, id is
{3}'.format(celery_task.status, celery_task.ready(), celery_task.result,
celery_task.id)
self.status = celery_task.status
existing_session = Session.object_session(self)
if not existing_session:
diff --git a/wikimetrics/templates/index.html b/wikimetrics/templates/index.html
index 1ec724f..e3be630 100644
--- a/wikimetrics/templates/index.html
+++ b/wikimetrics/templates/index.html
@@ -27,7 +27,7 @@
.
</p>
<p class="margin-top:1em">
- <a class="btn btn-large" href="/about/">Learn More</a>
+ <a class="btn btn-large" href="{{url_for('home_about')}}">Learn
More</a>
<a class="btn btn-primary btn-large"
href="{{url_for('jobs_request')}}">Analyze</a>
</p>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/75607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e4e7c8e504059940eedbe33d0d9967f780f5a48
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
