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

This commit is contained in:
Christopher Allan Webber 2011-05-08 07:11:57 -05:00
commit 0ce26c370c

View File

@ -114,8 +114,9 @@ class MediaGoblinApp(object):
def paste_app_factory(global_config, **app_config): def paste_app_factory(global_config, **app_config):
# Get the database connection # Get the database connection
port = int(app_config.get('db_port'))
connection = mongokit.Connection( connection = mongokit.Connection(
app_config.get('db_host'), app_config.get('db_port')) app_config.get('db_host'), port)
# Set up the storage systems. # Set up the storage systems.
public_store = storage.storage_system_from_paste_config( public_store = storage.storage_system_from_paste_config(