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

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index e93e0c4e31e62c3bf7ec2bc38c67addd5bac3147..5c094f382029960e1afeb3a59954a4bc49bbdea5 100644 (file)
--- 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(