Erosen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/72955
Change subject: removes redis config code--now using celery to access task
results, which is cleaner anyway
......................................................................
removes redis config code--now using celery to access task results, which is
cleaner anyway
Change-Id: Iacd83111b4262b64f081f81b15f5277c204b48f4
---
M wikimetrics/configurables.py
M wikimetrics/controllers/jobs.py
M wikimetrics/run.py
3 files changed, 2 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/55/72955/1
diff --git a/wikimetrics/configurables.py b/wikimetrics/configurables.py
index 38580c7..0f35406 100644
--- a/wikimetrics/configurables.py
+++ b/wikimetrics/configurables.py
@@ -73,25 +73,3 @@
queue.config_from_object(config_object)
if args.override_config:
queue.config_from_object(args.override_config)
-
- # makes Flask app context available to celery tasks
- #TaskBase = queue.Task
-
-
- #class ContextTask(TaskBase):
- #abstract = True
- #def __call__(self, *args, **kwargs):
- #with app.app_context():
- #return TaskBase.__call__(self, *args, **kwargs)
- #queue.Task = ContextTask
-
-def config_redis(args):
- from redis import ConnectionPool
- global redis_pool
- redis_config = create_object_from_config_file(args.redis_config)
- redis_pool = ConnectionPool(
- host=redis_config.REDIS_HOST,
- port=redis_config.REDIS_PORT,
- db=redis_config.REDIS_DB
- )
-
diff --git a/wikimetrics/controllers/jobs.py b/wikimetrics/controllers/jobs.py
index 62bedd8..1a4ee88 100644
--- a/wikimetrics/controllers/jobs.py
+++ b/wikimetrics/controllers/jobs.py
@@ -1,7 +1,7 @@
from flask import render_template, redirect, request, jsonify
from flask.ext.login import current_user
import celery
-from ..configurables import app, db, redis_pool
+from ..configurables import app, db
from ..models import Cohort, Job, JobResponse, PersistentJob
from ..metrics import metric_classes
import json
diff --git a/wikimetrics/run.py b/wikimetrics/run.py
index 5a9f987..5e47ada 100644
--- a/wikimetrics/run.py
+++ b/wikimetrics/run.py
@@ -3,7 +3,7 @@
import sys
import logging
import pprint
-from .configurables import config_web, config_db, config_celery, config_redis
+from .configurables import config_web, config_db, config_celery
logger = logging.getLogger(__name__)
@@ -75,14 +75,6 @@
help='Celery config file',
dest='celery_config',
)
- parser.add_argument(
- '--redis-config', '-r',
- default='wikimetrics/config/redis_config.py',
- help='''Redis info used for tracking jobs in Celery results backend
- specifically, the following equality should always hold:
- CELERY_RESULT_BACKEND == 'redis://REDIS_HOST:REDIS_PORT/REDIS_DB
- ''',
- dest='redis_config')
return parser
@@ -98,7 +90,6 @@
config_web(args)
config_db(args)
config_celery(args)
-config_redis(args)
def main():
--
To view, visit https://gerrit.wikimedia.org/r/72955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd83111b4262b64f081f81b15f5277c204b48f4
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
