diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-18 08:44:57 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-18 08:44:57 -0500 |
| commit | 3262ad1dbbc1919de2393e11900f5a47ac5dcd75 (patch) | |
| tree | c5bb272f467fe37d2d27dd47237545832c3a2a5b /mediagoblin/celery_setup/from_celery.py | |
| parent | 468bc8afce0eab35ca3d403708a27187f65e96ac (diff) | |
| download | mediagoblin-3262ad1dbbc1919de2393e11900f5a47ac5dcd75.tar.lz mediagoblin-3262ad1dbbc1919de2393e11900f5a47ac5dcd75.tar.xz mediagoblin-3262ad1dbbc1919de2393e11900f5a47ac5dcd75.zip | |
Renaming connect_database to connect_database_from_config and using in from_celery
Diffstat (limited to 'mediagoblin/celery_setup/from_celery.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_celery.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py index 65dcca40..57b52f56 100644 --- a/mediagoblin/celery_setup/from_celery.py +++ b/mediagoblin/celery_setup/from_celery.py @@ -22,6 +22,7 @@ from paste.deploy.converters import asint, asbool from mediagoblin import storage from mediagoblin.db import models +from mediagoblin.db.util import connect_database_from_config from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.globals import setup_globals from mediagoblin import globals as mgoblin_globals @@ -69,11 +70,8 @@ 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) + connection = connect_database_from_config(mgoblin_section) + db = connection[mgoblin_section.get('db_name', 'mediagoblin')] models.register_models(connection) |