Renaming connect_database to connect_database_from_config and using in from_celery

3 files changed, 6 insertions, 8 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(
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)
 
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index f70a5826..407caf05 100644
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -23,7 +23,7 @@ from pymongo import DESCENDING
 from mongokit import ObjectId
 
 
-def connect_database(app_config):
+def connect_database_from_config(app_config):
     """Connect to the main database, take config from app_config"""
     port = app_config.get('db_port')
     if port: