diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-07-31 13:54:07 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-08-09 13:13:04 +0200 |
| commit | ed7970696e3194fdfc9fb597342e2cecacc75935 (patch) | |
| tree | baf8f92379ff1150c2e31b125aa76b5ce3fd55d7 /mediagoblin/init | |
| parent | d1e67890da02f29a8fc4605c2f6601526fcacf35 (diff) | |
| download | mediagoblin-ed7970696e3194fdfc9fb597342e2cecacc75935.tar.lz mediagoblin-ed7970696e3194fdfc9fb597342e2cecacc75935.tar.xz mediagoblin-ed7970696e3194fdfc9fb597342e2cecacc75935.zip | |
Storage Config: Use own section
Instead of configuring storage X by parameters in the main
section "X_class = backend" and "X_param = value", use a
new section in the config: "[storage:X]" and use "class =
backend" and "param = value" there.
This is the beginning, it includes a try at being backward
compatible. But that try isn't really fully useful anyway.
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/__init__.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index ff005703..b87bd7a4 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -113,9 +113,23 @@ def get_staticdirector(app_config): def setup_storage(): app_config = mg_globals.app_config + global_config = mg_globals.global_config - public_store = storage_system_from_config(app_config, 'publicstore') - queue_store = storage_system_from_config(app_config, 'queuestore') + key_short = 'publicstore' + key_long = "storage:" + key_short + if global_config.has_key(key_long): + print "New style" + public_store = storage_system_from_config(global_config[key_long], None) + else: + print "old style" + public_store = storage_system_from_config(app_config, key_short) + + key_short = 'queuestore' + key_long = "storage:" + key_short + if global_config.has_key(key_long): + queue_store = storage_system_from_config(global_config[key_long], None) + else: + queue_store = storage_system_from_config(app_config, key_short) setup_globals( public_store = public_store, |