aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index c94b5f6d..60adba56 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -22,7 +22,7 @@ from webob import Request, exc
from mediagoblin import routing, util, storage, staticdirect
from mediagoblin.db import models
-from mediagoblin.db.util import connect_database
+from mediagoblin.db.util import connect_database_from_config
from mediagoblin.globals import setup_globals
from mediagoblin.celery_setup import setup_celery_from_config
@@ -118,7 +118,7 @@ class MediaGoblinApp(object):
def paste_app_factory(global_config, **app_config):
# Get the database connection
- connection = connect_database(app_config)
+ connection = connect_database_from_config(app_config)
# Set up the storage systems.
public_store = storage.storage_system_from_paste_config(