diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-07-11 23:25:15 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-07-11 23:25:15 +0200 |
| commit | 39c6b2bdc601c60dd3cf1acacf795fec721224ca (patch) | |
| tree | 41e4749966fbc5c7904ff9803c3eefddb4809bc4 | |
| parent | 3054e2b3cb08839aca7da2e1c5b4cce1768bf705 (diff) | |
| download | mediagoblin-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.
| -rw-r--r-- | mediagoblin/config_spec.ini | 2 | ||||
| -rw-r--r-- | mediagoblin/db/open.py | 2 | ||||
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index b6356b0e..28be5f34 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -1,7 +1,7 @@ [mediagoblin] # database stuff db_host = string() -db_name = string() +db_name = string(default="mediagoblin") db_port = integer() # diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py index cae33394..b6987677 100644 --- a/mediagoblin/db/open.py +++ b/mediagoblin/db/open.py @@ -30,7 +30,7 @@ def connect_database_from_config(app_config): def setup_connection_and_db_from_config(app_config): connection = connect_database_from_config(app_config) - database_path = app_config.get('db_name', 'mediagoblin') + database_path = app_config['db_name'] db = connection[database_path] models.register_models(connection) # Could configure indexes here on db 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 |