vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change distributed config format to make it easier for the setup tool

Browse source
This commit is contained in:
Joseph Schorr 2014-08-07 13:45:15 -04:00
parent 979f78f677
commit bcbea37fce
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.py
View file

@ -150,8 +150,8 @@ class DefaultConfig(object):
FEATURE_GITHUB_BUILD = False FEATURE_GITHUB_BUILD = False
DISTRIBUTED_STORAGE_CONFIG = { DISTRIBUTED_STORAGE_CONFIG = {
'local_eu': ['LocalStorage', 'test/data/registry/eu'], 'local_eu': ['LocalStorage', {'storage_path': 'test/data/registry/eu'}],
'local_us': ['LocalStorage', 'test/data/registry/us'], 'local_us': ['LocalStorage', {'storage_path': 'test/data/registry/us'}],
} }
DISTRIBUTED_STORAGE_PREFERENCE = ['local_us'] DISTRIBUTED_STORAGE_PREFERENCE = ['local_us']

8
storage/__init__.py
View file

@ -13,17 +13,15 @@ class Storage(object):
self.state = None self.state = None
def init_app(self, app): def init_app(self, app):
# storage_type = app.config.get('STORAGE_TYPE', 'LocalStorage')
# path = app.config.get('STORAGE_PATH', '')
storages = {} storages = {}
for location, storage_params in app.config.get('DISTRIBUTED_STORAGE_CONFIG').items(): for location, storage_params in app.config.get('DISTRIBUTED_STORAGE_CONFIG').items():
driver = storage_params[0] driver = storage_params[0]
parameters = storage_params[1]
if driver == 'LocalStorage': if driver == 'LocalStorage':
storage = LocalStorage(*storage_params[1:]) storage = LocalStorage(**parameters)
elif driver == 'S3Storage': elif driver == 'S3Storage':
storage = S3Storage(*storage_params[1:]) storage = S3Storage(**parameters)
else: else:
storage = FakeStorage() storage = FakeStorage()