diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-21 13:51:05 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-21 13:51:05 -0500 |
| commit | bd3b566dbecdcc9e0ee0f919e63ae753869db187 (patch) | |
| tree | df7ed67455b7bb20840dd1cc857a102f73de19a9 /mediagoblin/init/__init__.py | |
| parent | ae72c6381475408d83bfcf702c8eed7d4d80c1f5 (diff) | |
| parent | 758eb746547cc8c6c52135fd88bee11b5f81d3d4 (diff) | |
| download | mediagoblin-bd3b566dbecdcc9e0ee0f919e63ae753869db187.tar.lz mediagoblin-bd3b566dbecdcc9e0ee0f919e63ae753869db187.tar.xz mediagoblin-bd3b566dbecdcc9e0ee0f919e63ae753869db187.zip | |
Merge remote branch 'remotes/elrond/dev/storage_config'
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, |