archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Raise ConfigurationMissingError instead of SystemExit

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-05-18 09:59:09 +02:00
parent 091c70e735
commit 19d9684a67
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pillar/__init__.py
View File

@ -36,6 +36,13 @@ empty_settings = {
} }
class ConfigurationMissingError(SystemExit):
"""Raised when a vital configuration key is missing.
Causes Python to exit.
"""
class PillarServer(Eve): class PillarServer(Eve):
def __init__(self, app_root, **kwargs): def __init__(self, app_root, **kwargs):
kwargs.setdefault('validator', custom_field_validation.ValidateCustomFields) kwargs.setdefault('validator', custom_field_validation.ValidateCustomFields)
@ -152,13 +159,13 @@ class PillarServer(Eve):
os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = \ os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = \
self.config['GCLOUD_APP_CREDENTIALS'] self.config['GCLOUD_APP_CREDENTIALS']
except KeyError: except KeyError:
raise SystemExit('GCLOUD_APP_CREDENTIALS configuration is missing') raise ConfigurationMissingError('GCLOUD_APP_CREDENTIALS configuration is missing')
# Storage backend (GCS) # Storage backend (GCS)
try: try:
os.environ['GCLOUD_PROJECT'] = self.config['GCLOUD_PROJECT'] os.environ['GCLOUD_PROJECT'] = self.config['GCLOUD_PROJECT']
except KeyError: except KeyError:
raise SystemExit('GCLOUD_PROJECT configuration value is missing') raise ConfigurationMissingError('GCLOUD_PROJECT configuration value is missing')
def _config_algolia(self): def _config_algolia(self):
# Algolia search # Algolia search