aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init/celery/__init__.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-07-11 23:25:15 +0200
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-07-11 23:25:15 +0200
commit39c6b2bdc601c60dd3cf1acacf795fec721224ca (patch)
tree41e4749966fbc5c7904ff9803c3eefddb4809bc4 /mediagoblin/init/celery/__init__.py
parent3054e2b3cb08839aca7da2e1c5b4cce1768bf705 (diff)
downloadmediagoblin-39c6b2bdc601c60dd3cf1acacf795fec721224ca.tar.lz
mediagoblin-39c6b2bdc601c60dd3cf1acacf795fec721224ca.tar.xz
mediagoblin-39c6b2bdc601c60dd3cf1acacf795fec721224ca.zip
Move db_name default into config_spec.ini
The default name of the database ("mediagoblin") was coded in db/open.py and init/celery/__init__.py. Instead use the new config system to have this as the default for the "db_name" config option.
Diffstat (limited to 'mediagoblin/init/celery/__init__.py')
-rw-r--r--mediagoblin/init/celery/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index 67c3dfa0..bfae954e 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -62,7 +62,7 @@ def setup_celery_from_config(app_config, global_config,
celery_mongo_settings['port'] = app_config['db_port']
if celery_settings['BROKER_BACKEND'] == 'mongodb':
celery_settings['BROKER_PORT'] = app_config['db_port']
- celery_mongo_settings['database'] = app_config.get('db_name', 'mediagoblin')
+ celery_mongo_settings['database'] = app_config['db_name']
celery_settings['CELERY_MONGODB_BACKEND_SETTINGS'] = celery_mongo_settings