Erosen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74551
Change subject: adds mediawiki editors / edits to demo databases and adds
production relaod script to scripts dir
......................................................................
adds mediawiki editors / edits to demo databases and adds production relaod
script to scripts dir
Change-Id: I455429074878b2adb0a61243e523bc53a0652846
---
A scripts/update_and_restart
M wikimetrics/controllers/demo.py
M wikimetrics/controllers/jobs.py
3 files changed, 60 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/51/74551/1
diff --git a/scripts/update_and_restart b/scripts/update_and_restart
new file mode 100755
index 0000000..5695390
--- /dev/null
+++ b/scripts/update_and_restart
@@ -0,0 +1,5 @@
+cd /usr/lib/wikimetrics
+git pull
+restart wikimetrics-queue
+service apache2 restart
+tail -f /var/log/apache2/*
diff --git a/wikimetrics/controllers/demo.py b/wikimetrics/controllers/demo.py
index 66698d9..1de9896 100644
--- a/wikimetrics/controllers/demo.py
+++ b/wikimetrics/controllers/demo.py
@@ -11,6 +11,8 @@
CohortWikiUser,
MetricJob,
)
+from ..models.mediawiki import Logging, Revision, Page
+from datetime import datetime
from ..metrics import RandomMetric
import logging
logger = logging.getLogger(__name__)
@@ -212,4 +214,55 @@
db_sess.commit()
db_sess.close()
+
+ mwSession = db.get_mw_session('enwiki')
+ mwSession.add(MediawikiUser(user_id=1, user_name='Dan'))
+ mwSession.add(MediawikiUser(user_id=2, user_name='Evan'))
+ mwSession.add(MediawikiUser(user_id=3, user_name='Andrew'))
+ mwSession.add(Logging(log_id=1, log_user_text='Reedy'))
+ mwSession.add(Page(page_id=1, page_namespace=0,
page_title='Main_Page'))
+ # edits in between Dan and Evan edits
+ mwSession.add(Revision(
+ rev_id=1, rev_page=1, rev_user=4, rev_comment='before Dan edit 1',
+ rev_len=4, rev_timestamp=datetime(2013, 05, 30),
+ ))
+ mwSession.add(Revision(
+ rev_id=3, rev_page=1, rev_user=4, rev_comment='before Dan edit 2',
+ rev_len=0, rev_timestamp=datetime(2013, 06, 30),
+ ))
+ mwSession.add(Revision(
+ rev_id=5, rev_page=1, rev_user=4, rev_comment='before Evan edit 1',
+ rev_len=0, rev_timestamp=datetime(2013, 05, 30),
+ ))
+ mwSession.add(Revision(
+ rev_id=7, rev_page=1, rev_user=4, rev_comment='before Evan edit 2',
+ rev_len=100, rev_timestamp=datetime(2013, 06, 30),
+ ))
+ mwSession.add(Revision(
+ rev_id=9, rev_page=1, rev_user=4, rev_comment='before Evan edit 3',
+ rev_len=140, rev_timestamp=datetime(2013, 07, 23),
+ ))
+ # Dan edits
+ mwSession.add(Revision(
+ rev_id=2, rev_page=1, rev_user=1, rev_comment='Dan edit 1',
+ rev_parent_id=1, rev_len=0, rev_timestamp=datetime(2013, 06, 01),
+ ))
+ mwSession.add(Revision(
+ rev_id=4, rev_page=1, rev_user=1, rev_comment='Dan edit 2',
+ rev_parent_id=3, rev_len=10, rev_timestamp=datetime(2013, 07, 01),
+ ))
+ # Evan edits
+ mwSession.add(Revision(
+ rev_id=6, rev_page=1, rev_user=2, rev_comment='Evan edit 1',
+ rev_parent_id=5, rev_len=100, rev_timestamp=datetime(2013, 06, 01),
+ ))
+ mwSession.add(Revision(
+ rev_id=8, rev_page=1, rev_user=2, rev_comment='Evan edit 2',
+ rev_parent_id=7, rev_len=140, rev_timestamp=datetime(2013, 07, 01),
+ ))
+ mwSession.add(Revision(
+ rev_id=10, rev_page=1, rev_user=2, rev_comment='Evan edit 3',
+ rev_parent_id=9, rev_len=136, rev_timestamp=datetime(2013, 07, 24),
+ ))
+ mwSession.commit()
return 'OK, wiped out the database and added cohorts only for ' +
current_user.email
diff --git a/wikimetrics/controllers/jobs.py b/wikimetrics/controllers/jobs.py
index 813a876..60efdc3 100644
--- a/wikimetrics/controllers/jobs.py
+++ b/wikimetrics/controllers/jobs.py
@@ -110,6 +110,8 @@
def job_result_csv(job_id):
db_session = db.get_session()
db_job = db_session.query(PersistentJob).get(job_id)
+ if not db_job:
+ return json_error('no task exists with id: {0}'.format(job_id))
celery_task = Job.task.AsyncResult(db_job.result_key)
if celery_task.ready():
task_result = celery_task.get()
--
To view, visit https://gerrit.wikimedia.org/r/74551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I455429074878b2adb0a61243e523bc53a0652846
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Erosen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
