heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move db_name default into config_spec.ini

Browse Source 
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.
This commit is contained in:
Elrond 2011-07-11 23:25:15 +02:00
parent 3054e2b3cb
commit 39c6b2bdc6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/config_spec.ini
View File

@ -1,7 +1,7 @@
[mediagoblin] [mediagoblin]
# database stuff # database stuff
db_host = string() db_host = string()
db_name = string() db_name = string(default="mediagoblin")
db_port = integer() db_port = integer()
# #

2
mediagoblin/db/open.py
View File

@ -30,7 +30,7 @@ def connect_database_from_config(app_config):
def setup_connection_and_db_from_config(app_config): def setup_connection_and_db_from_config(app_config):
connection = connect_database_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] db = connection[database_path]
models.register_models(connection) models.register_models(connection)
# Could configure indexes here on db # Could configure indexes here on db

2
mediagoblin/init/celery/__init__.py
View File

@ -62,7 +62,7 @@ def setup_celery_from_config(app_config, global_config,
celery_mongo_settings['port'] = app_config['db_port'] celery_mongo_settings['port'] = app_config['db_port']
if celery_settings['BROKER_BACKEND'] == 'mongodb': if celery_settings['BROKER_BACKEND'] == 'mongodb':
celery_settings['BROKER_PORT'] = app_config['db_port'] 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 celery_settings['CELERY_MONGODB_BACKEND_SETTINGS'] = celery_mongo_settings