from paste.deploy.converters import asbool
from mediagoblin import storage
-from mediagoblin.db import models
-from mediagoblin.db.util import connect_database_from_config
+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
settings_module=OUR_MODULENAME,
set_environ=False)
- connection = connect_database_from_config(mgoblin_section)
-
- 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(