From 5c6bda1ba3a0c0fc3437c5e0c8374bf8f1a37b4e Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Mon, 14 Mar 2016 17:02:12 +0100 Subject: [PATCH] Tweaks to init code --- pillar/application/__init__.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pillar/application/__init__.py b/pillar/application/__init__.py index 8b67bc80..0dc21d97 100644 --- a/pillar/application/__init__.py +++ b/pillar/application/__init__.py @@ -105,14 +105,19 @@ bugsnag.configure( ) handle_exceptions(app) -# Storage backend (GCS) +# Google Cloud project try: os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = \ - app.config['GOOGLE_APPLICATION_CREDENTIALS'] + app.config['GCLOUD_APP_CREDENTIALS'] except KeyError: - log.debug("The GOOGLE_APPLICATION_CREDENTIALS configuration value should " - "point to an existing and valid JSON file.") - raise + raise SystemExit('GOOGLE_APPLICATION_CREDENTIALS configuration is missing') + +# Storage backend (GCS) +try: + os.environ['GCLOUD_PROJECT'] = \ + app.config['GCLOUD_PROJECT'] +except KeyError: + raise SystemExit('GCLOUD_PROJECT configuration value is missing') # Algolia search