Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71712
Change subject: celery task running on flask
......................................................................
celery task running on flask
Change-Id: I8ff82b12274f9dedaad4c90ecbe25a94939561ed
---
M wikimetrics/configurables.py
M wikimetrics/controllers/authentication.py
M wikimetrics/controllers/demo.py
M wikimetrics/run.py
4 files changed, 186 insertions(+), 138 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/12/71712/1
diff --git a/wikimetrics/configurables.py b/wikimetrics/configurables.py
index da54c31..e9d7e8a 100644
--- a/wikimetrics/configurables.py
+++ b/wikimetrics/configurables.py
@@ -76,6 +76,8 @@
# makes Flask app context available to celery tasks
TaskBase = queue.Task
+
+
class ContextTask(TaskBase):
abstract = True
def __call__(self, *args, **kwargs):
diff --git a/wikimetrics/controllers/authentication.py
b/wikimetrics/controllers/authentication.py
index 9ebff66..797956b 100644
--- a/wikimetrics/controllers/authentication.py
+++ b/wikimetrics/controllers/authentication.py
@@ -55,7 +55,6 @@
if current_user.is_authenticated():
return
- print request.endpoint
# TODO: put static resources in a new Blueprint
if (
request.endpoint
@@ -70,7 +69,6 @@
"""
Callback required by Flask-Login. Gets the User object from the database.
"""
- print 'calling load_user on user_id=%s' % user_id
db_session = db.get_session()
user = User.get(db_session, user_id)
return user
diff --git a/wikimetrics/controllers/demo.py b/wikimetrics/controllers/demo.py
index 936b243..f472e10 100644
--- a/wikimetrics/controllers/demo.py
+++ b/wikimetrics/controllers/demo.py
@@ -9,142 +9,192 @@
CohortUser,
CohortUserRole,
CohortWikiUser,
+ MetricJob,
)
+from ..metrics import RandomMetric
import logging
logger = logging.getLogger(__name__)
-# TODO: this is an obvious serious security flaw. Either come up with a way to
-# isolate it or remove the functionality
[email protected]('/demo/create/cohorts/')
-def add_demo_cohorts():
- db_session = db.get_session()
- user = db_session.query(User).filter_by(email=current_user.email).one()
+if app.config['DEBUG']:
+ @app.route('/demo/metric/random/<int:cohort_id>')
+ def run_task_in_celery(cohort_id):
+ db_session = db.get_session()
+ user_ids = db_session.query(WikiUser.mediawiki_userid)\
+ .join(CohortWikiUser)\
+ .filter(CohortWikiUser.cohort_id == cohort_id)\
+ .all()
+ if len(user_ids) == 0:
+ user_ids = db_session.query(WikiUser.mediawiki_userid).all()
+
+ job = MetricJob(RandomMetric(), user_ids, 'enwiki')
+ res = job.run.delay(job).get()
+ print user_ids
+ return str(res)
- db_session.query(CohortUser).delete()
- db_session.query(CohortWikiUser).delete()
- db_session.query(WikiUser).delete()
- db_session.query(Cohort).delete()
-
- # add cohorts and assign ownership to the passed-in user
- db_session.add(Cohort(id=1, name='Algeria Summer Teahouse',
description='', enabled=True))
- db_session.add(Cohort(id=2, name='Berlin Beekeeping Society',
description='', enabled=True))
- db_session.add(Cohort(id=3, name='A/B April', description='',
enabled=True))
- db_session.add(Cohort(id=4, name='A/B March', description='',
enabled=True))
- db_session.add(Cohort(id=5, name='A/B February', description='',
enabled=True))
- db_session.add(Cohort(id=6, name='A/B January', description='',
enabled=True))
- db_session.add(Cohort(id=7, name='A/B December', description='',
enabled=True))
- db_session.add(Cohort(id=8, name='A/B October', description='',
enabled=True))
- db_session.add(Cohort(id=9, name='A/B September', description='',
enabled=True))
- db_session.add(Cohort(id=10, name='A/B August', description='',
enabled=True))
- db_session.add(Cohort(id=11, name='A/B July', description='',
enabled=True))
-
- db_session.add(CohortUser(user_id=user.id, cohort_id=1,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=2,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=3,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=4,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=5,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=6,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=7,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=8,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=9,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=10,
role=CohortUserRole.OWNER))
- db_session.add(CohortUser(user_id=user.id, cohort_id=11,
role=CohortUserRole.OWNER))
-
- # TODO: these users don't actually exist in the mediawiki databases, add
them
- #db_enwiki_session = db.get_mw_session('enwiki')
- #db_dewiki_session = db.get_mw_session('dewiki')
- db_session.add(WikiUser(mediawiki_username='Dan', mediawiki_userid=1,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='Evan', mediawiki_userid=2,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='Andrew', mediawiki_userid=3,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='Diederik', mediawiki_userid=4,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='Andrea', mediawiki_userid=5,
project='dewiki'))
- db_session.add(WikiUser(mediawiki_username='Dennis', mediawiki_userid=6,
project='dewiki'))
- db_session.add(WikiUser(mediawiki_username='Florian', mediawiki_userid=7,
project='dewiki'))
- db_session.add(WikiUser(mediawiki_username='Gabriele', mediawiki_userid=8,
project='dewiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=9,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=10,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=11,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=12,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=13,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=14,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=15,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=16,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=17,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=18,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=19,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=20,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=21,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=22,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=23,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=24,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=25,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=26,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=27,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=28,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=29,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=30,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=31,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=32,
project='enwiki'))
-
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=33,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=34,
project='enwiki'))
- db_session.add(WikiUser(mediawiki_username='n/a', mediawiki_userid=35,
project='enwiki'))
-
- db_session.add(CohortWikiUser(wiki_user_id=1, cohort_id=1))
- db_session.add(CohortWikiUser(wiki_user_id=2, cohort_id=1))
- db_session.add(CohortWikiUser(wiki_user_id=3, cohort_id=1))
- db_session.add(CohortWikiUser(wiki_user_id=4, cohort_id=1))
-
- db_session.add(CohortWikiUser(wiki_user_id=5, cohort_id=2))
- db_session.add(CohortWikiUser(wiki_user_id=6, cohort_id=2))
- db_session.add(CohortWikiUser(wiki_user_id=7, cohort_id=2))
- db_session.add(CohortWikiUser(wiki_user_id=8, cohort_id=2))
-
- db_session.add(CohortWikiUser(wiki_user_id=9, cohort_id=3))
- db_session.add(CohortWikiUser(wiki_user_id=10, cohort_id=3))
- db_session.add(CohortWikiUser(wiki_user_id=11, cohort_id=3))
-
- db_session.add(CohortWikiUser(wiki_user_id=12, cohort_id=4))
- db_session.add(CohortWikiUser(wiki_user_id=13, cohort_id=4))
- db_session.add(CohortWikiUser(wiki_user_id=14, cohort_id=4))
-
- db_session.add(CohortWikiUser(wiki_user_id=15, cohort_id=5))
- db_session.add(CohortWikiUser(wiki_user_id=16, cohort_id=5))
- db_session.add(CohortWikiUser(wiki_user_id=17, cohort_id=5))
-
- db_session.add(CohortWikiUser(wiki_user_id=18, cohort_id=6))
- db_session.add(CohortWikiUser(wiki_user_id=19, cohort_id=6))
- db_session.add(CohortWikiUser(wiki_user_id=20, cohort_id=6))
-
- db_session.add(CohortWikiUser(wiki_user_id=21, cohort_id=7))
- db_session.add(CohortWikiUser(wiki_user_id=22, cohort_id=7))
- db_session.add(CohortWikiUser(wiki_user_id=23, cohort_id=7))
-
- db_session.add(CohortWikiUser(wiki_user_id=24, cohort_id=8))
- db_session.add(CohortWikiUser(wiki_user_id=25, cohort_id=8))
- db_session.add(CohortWikiUser(wiki_user_id=26, cohort_id=8))
-
- db_session.add(CohortWikiUser(wiki_user_id=27, cohort_id=9))
- db_session.add(CohortWikiUser(wiki_user_id=28, cohort_id=9))
- db_session.add(CohortWikiUser(wiki_user_id=29, cohort_id=9))
-
- db_session.add(CohortWikiUser(wiki_user_id=30, cohort_id=10))
- db_session.add(CohortWikiUser(wiki_user_id=31, cohort_id=10))
- db_session.add(CohortWikiUser(wiki_user_id=32, cohort_id=10))
-
- db_session.add(CohortWikiUser(wiki_user_id=33, cohort_id=11))
- db_session.add(CohortWikiUser(wiki_user_id=34, cohort_id=11))
- db_session.add(CohortWikiUser(wiki_user_id=35, cohort_id=11))
-
- db_session.commit()
- return 'OK, wiped out the database and added cohorts only for ' +
current_user.email
+ @app.route('/demo/create/cohorts/')
+ def add_demo_cohorts():
+ db_sess = db.get_session()
+ user = db_sess.query(User).filter_by(email=current_user.email).one()
+
+ # delete all of this user's data
+ db_sess.query(CohortUser).filter_by(user_id=user.id).delete()
+ cwu = db_sess.query(CohortWikiUser)\
+ .join(Cohort)\
+ .join(CohortUser)\
+ .filter(CohortUser.user_id == user.id)\
+ .all()
+ wu = db_sess.query(WikiUser)\
+ .join(CohortWikiUser)\
+ .join(Cohort)\
+ .join(CohortUser)\
+ .filter(CohortUser.user_id == user.id)\
+ .all()
+ c = db_sess.query(Cohort)\
+ .join(CohortUser)\
+ .filter(CohortUser.user_id == user.id)\
+ .all()
+ for r in cwu:
+ db_sess.delete(r)
+ for r in wu:
+ db_sess.delete(r)
+ for r in c:
+ db_sess.delete(r)
+
+ db_sess.commit()
+
+ # add cohorts and assign ownership to the passed-in user
+ cohort1 = Cohort(name='Algeria Summer Teahouse', description='',
enabled=True)
+ cohort2 = Cohort(name='Berlin Beekeeping Society', description='',
enabled=True)
+ cohort3 = Cohort(name='A/B April', description='', enabled=True)
+ cohort4 = Cohort(name='A/B March', description='', enabled=True)
+ cohort5 = Cohort(name='A/B February', description='', enabled=True)
+ cohort6 = Cohort(name='A/B January', description='', enabled=True)
+ cohort7 = Cohort(name='A/B December', description='', enabled=True)
+ cohort8 = Cohort(name='A/B October', description='', enabled=True)
+ cohort9 = Cohort(name='A/B September', description='', enabled=True)
+ cohort10 = Cohort(name='A/B August', description='', enabled=True)
+ cohort11 = Cohort(name='A/B July', description='', enabled=True)
+ db_sess.add_all([
+ cohort1, cohort2, cohort3, cohort4, cohort5, cohort6,
+ cohort7, cohort8, cohort9, cohort10, cohort11
+ ])
+ db_sess.commit()
+
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort1.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort2.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort3.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort4.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort5.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort6.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort7.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort8.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort9.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort10.id,
role=CohortUserRole.OWNER))
+ db_sess.add(CohortUser(user_id=user.id, cohort_id=cohort11.id,
role=CohortUserRole.OWNER))
+
+ # TODO: these users don't actually exist in the mediawiki databases,
add them
+ #db_enwiki_session = db.get_mw_session('enwiki')
+ #db_dewiki_session = db.get_mw_session('dewiki')
+ wu1 = WikiUser(mediawiki_username='Dan', mediawiki_userid=1,
project='enwiki')
+ wu2 = WikiUser(mediawiki_username='Evan', mediawiki_userid=2,
project='enwiki')
+ wu3 = WikiUser(mediawiki_username='Andrew', mediawiki_userid=3,
project='enwiki')
+ wu4 = WikiUser(mediawiki_username='Diederik', mediawiki_userid=4,
project='enwiki')
+
+ wu5 = WikiUser(mediawiki_username='Andrea', mediawiki_userid=5,
project='dewiki')
+ wu6 = WikiUser(mediawiki_username='Dennis', mediawiki_userid=6,
project='dewiki')
+ wu7 = WikiUser(mediawiki_username='Florian', mediawiki_userid=7,
project='dewiki')
+ wu8 = WikiUser(mediawiki_username='Gabriele', mediawiki_userid=8,
project='dewiki')
+
+ wu9 = WikiUser(mediawiki_username='n/a', mediawiki_userid=9,
project='enwiki')
+ wu10 = WikiUser(mediawiki_username='n/a', mediawiki_userid=10,
project='enwiki')
+ wu11 = WikiUser(mediawiki_username='n/a', mediawiki_userid=11,
project='enwiki')
+
+ wu12 = WikiUser(mediawiki_username='n/a', mediawiki_userid=12,
project='enwiki')
+ wu13 = WikiUser(mediawiki_username='n/a', mediawiki_userid=13,
project='enwiki')
+ wu14 = WikiUser(mediawiki_username='n/a', mediawiki_userid=14,
project='enwiki')
+
+ wu15 = WikiUser(mediawiki_username='n/a', mediawiki_userid=15,
project='enwiki')
+ wu16 = WikiUser(mediawiki_username='n/a', mediawiki_userid=16,
project='enwiki')
+ wu17 = WikiUser(mediawiki_username='n/a', mediawiki_userid=17,
project='enwiki')
+
+ wu18 = WikiUser(mediawiki_username='n/a', mediawiki_userid=18,
project='enwiki')
+ wu19 = WikiUser(mediawiki_username='n/a', mediawiki_userid=19,
project='enwiki')
+ wu20 = WikiUser(mediawiki_username='n/a', mediawiki_userid=20,
project='enwiki')
+
+ wu21 = WikiUser(mediawiki_username='n/a', mediawiki_userid=21,
project='enwiki')
+ wu22 = WikiUser(mediawiki_username='n/a', mediawiki_userid=22,
project='enwiki')
+ wu23 = WikiUser(mediawiki_username='n/a', mediawiki_userid=23,
project='enwiki')
+
+ wu24 = WikiUser(mediawiki_username='n/a', mediawiki_userid=24,
project='enwiki')
+ wu25 = WikiUser(mediawiki_username='n/a', mediawiki_userid=25,
project='enwiki')
+ wu26 = WikiUser(mediawiki_username='n/a', mediawiki_userid=26,
project='enwiki')
+
+ wu27 = WikiUser(mediawiki_username='n/a', mediawiki_userid=27,
project='enwiki')
+ wu28 = WikiUser(mediawiki_username='n/a', mediawiki_userid=28,
project='enwiki')
+ wu29 = WikiUser(mediawiki_username='n/a', mediawiki_userid=29,
project='enwiki')
+
+ wu30 = WikiUser(mediawiki_username='n/a', mediawiki_userid=30,
project='enwiki')
+ wu31 = WikiUser(mediawiki_username='n/a', mediawiki_userid=31,
project='enwiki')
+ wu32 = WikiUser(mediawiki_username='n/a', mediawiki_userid=32,
project='enwiki')
+
+ wu33 = WikiUser(mediawiki_username='n/a', mediawiki_userid=33,
project='enwiki')
+ wu34 = WikiUser(mediawiki_username='n/a', mediawiki_userid=34,
project='enwiki')
+ wu35 = WikiUser(mediawiki_username='n/a', mediawiki_userid=35,
project='enwiki')
+
+ db_sess.add_all([
+ wu1, wu2, wu3, wu4, wu5, wu6, wu7, wu8, wu9, wu10, wu11, wu12,
+ wu13, wu14, wu15, wu16, wu17, wu18, wu19, wu20, wu21, wu22, wu23,
+ wu24, wu25, wu26, wu27, wu28, wu29, wu30, wu31, wu32, wu33, wu34,
+ wu35,
+ ])
+ db_sess.commit()
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu1.id, cohort_id=cohort1.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu2.id, cohort_id=cohort1.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu3.id, cohort_id=cohort1.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu4.id, cohort_id=cohort1.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu5.id, cohort_id=cohort2.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu6.id, cohort_id=cohort2.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu7.id, cohort_id=cohort2.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu8.id, cohort_id=cohort2.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu9.id, cohort_id=cohort3.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu10.id, cohort_id=cohort3.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu11.id, cohort_id=cohort3.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu12.id, cohort_id=cohort4.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu13.id, cohort_id=cohort4.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu14.id, cohort_id=cohort4.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu15.id, cohort_id=cohort5.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu16.id, cohort_id=cohort5.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu17.id, cohort_id=cohort5.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu18.id, cohort_id=cohort6.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu19.id, cohort_id=cohort6.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu20.id, cohort_id=cohort6.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu21.id, cohort_id=cohort7.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu22.id, cohort_id=cohort7.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu23.id, cohort_id=cohort7.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu24.id, cohort_id=cohort8.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu25.id, cohort_id=cohort8.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu26.id, cohort_id=cohort8.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu27.id, cohort_id=cohort9.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu28.id, cohort_id=cohort9.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu29.id, cohort_id=cohort9.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu30.id,
cohort_id=cohort10.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu31.id,
cohort_id=cohort10.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu32.id,
cohort_id=cohort10.id))
+
+ db_sess.add(CohortWikiUser(wiki_user_id=wu33.id,
cohort_id=cohort11.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu34.id,
cohort_id=cohort11.id))
+ db_sess.add(CohortWikiUser(wiki_user_id=wu35.id,
cohort_id=cohort11.id))
+
+ db_sess.commit()
+ return 'OK, wiped out the database and added cohorts only for ' +
current_user.email
diff --git a/wikimetrics/run.py b/wikimetrics/run.py
index fbe841f..ae62c15 100644
--- a/wikimetrics/run.py
+++ b/wikimetrics/run.py
@@ -25,8 +25,7 @@
from .models import ConcatMetricsJob
from .models import MultiProjectMetricJob
from .models import MetricJob
- print 'queue.tasks: {0}'.format(pprint.pformat(queue.tasks))
- queue.start(argv=['celery', 'worker'])
+ queue.start(argv=['celery', 'worker', '-l', 'DEBUG'])
def setup_parser():
@@ -85,7 +84,6 @@
##################################
parser = setup_parser()
args = parser.parse_args()
-pprint.pprint(vars(args))
logger.info('running with arguments:\n%s', pprint.pformat(vars(args)))
# runs the appropriate config function (web, celery, test)
--
To view, visit https://gerrit.wikimedia.org/r/71712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ff82b12274f9dedaad4c90ecbe25a94939561ed
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
