diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-22 21:48:45 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-22 21:48:45 -0500 |
| commit | 894fa564e718af7398f6f368eb3ac0dcb4d45e1f (patch) | |
| tree | 9508a08f8d6598d1040cea44287c0e42af1a1ad6 /mediagoblin/init/__init__.py | |
| parent | 3a8c3a38559f2f81d6155c2349fcddc5ecd6ef28 (diff) | |
| parent | 132aa9d97a32abfe86bc5de3ea4e2fa62ddc3793 (diff) | |
| download | mediagoblin-894fa564e718af7398f6f368eb3ac0dcb4d45e1f.tar.lz mediagoblin-894fa564e718af7398f6f368eb3ac0dcb4d45e1f.tar.xz mediagoblin-894fa564e718af7398f6f368eb3ac0dcb4d45e1f.zip | |
Merge branch 'master' into jwandborg-f482_media_attachments
Conflicts:
mediagoblin/config_spec.ini
mediagoblin/edit/forms.py
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
Diffstat (limited to 'mediagoblin/init/__init__.py')
| -rw-r--r-- | mediagoblin/init/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index ff005703..44f604b1 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -112,10 +112,15 @@ def get_staticdirector(app_config): def setup_storage(): - app_config = mg_globals.app_config + global_config = mg_globals.global_config + + key_short = 'publicstore' + key_long = "storage:" + key_short + public_store = storage_system_from_config(global_config[key_long]) - public_store = storage_system_from_config(app_config, 'publicstore') - queue_store = storage_system_from_config(app_config, 'queuestore') + key_short = 'queuestore' + key_long = "storage:" + key_short + queue_store = storage_system_from_config(global_config[key_long]) setup_globals( public_store = public_store, |