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.
This commit is contained in:
parent
3054e2b3cb
commit
39c6b2bdc6
@ -1,7 +1,7 @@
|
||||
[mediagoblin]
|
||||
# database stuff
|
||||
db_host = string()
|
||||
db_name = string()
|
||||
db_name = string(default="mediagoblin")
|
||||
db_port = integer()
|
||||
|
||||
#
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user