Merge remote branch 'refs/remotes/spaetz/master'

2011-05-08 07:11:57 -05:00
parent eef100ada5 19f8a24e41
commit 0ce26c370c
1 changed files with 2 additions and 1 deletions
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -114,8 +114,9 @@ class MediaGoblinApp(object):

 def paste_app_factory(global_config, **app_config):
    # Get the database connection
+    port = int(app_config.get('db_port'))
    connection = mongokit.Connection(
-        app_config.get('db_host'), app_config.get('db_port'))
+        app_config.get('db_host'), port)

    # Set up the storage systems.
    public_store = storage.storage_system_from_paste_config(