diff options
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 55e638b9..0669e80c 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -16,11 +16,11 @@ import os -import mongokit from paste.deploy.loadwsgi import NicerConfigParser -from paste.deploy.converters import asint, asbool +from paste.deploy.converters import asbool -from mediagoblin import storage, models +from mediagoblin import storage +from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.globals import setup_globals from mediagoblin import globals as mgoblin_globals @@ -68,13 +68,7 @@ def setup_self(setup_globals_func=setup_globals): settings_module=OUR_MODULENAME, set_environ=False) - port = mgoblin_section.get('db_port') - if port: - port = asint(port) - connection = mongokit.Connection( - mgoblin_section.get('db_host'), port) - db = connection[mgoblin_section.get('db_name', 'mediagoblin')] - models.register_models(connection) + connection, db = setup_connection_and_db_from_config(mgoblin_section) # Set up the storage systems. public_store = storage.storage_system_from_paste_config( |