From 9c5fcfac17987fc16b6d3000e0d32bd28612669e Mon Sep 17 00:00:00 2001 From: stv Date: Fri, 4 Nov 2016 16:04:55 -0700 Subject: [PATCH] Fallback to default ZENDESK_URL when not in JSON This line previously departed from the convention of coalescing down to the original value specified in `lms/envs/common.py`. Now, the setting can fall back to its default value from `common.py`, instead of only respecting the value loaded from JSON (or `None` if not defined). --- lms/envs/aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e00eef54c2..0a573dd0c7 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -326,7 +326,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {}) COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '') COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '') CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull') -ZENDESK_URL = ENV_TOKENS.get("ZENDESK_URL") +ZENDESK_URL = ENV_TOKENS.get('ZENDESK_URL', ZENDESK_URL) FEEDBACK_SUBMISSION_EMAIL = ENV_TOKENS.get("FEEDBACK_SUBMISSION_EMAIL") MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', MKTG_URLS)