From a32f3373264dc4273e35300e2090f2ef4aadaf23 Mon Sep 17 00:00:00 2001
From: John Jarvis <john@jarv.org>
Date: Thu, 4 Dec 2014 16:43:17 -0500
Subject: [PATCH] renmaing prod.py and setting more defaults

---
 cms/envs/common.py                   | 2 ++
 cms/envs/{prod.py => yaml-config.py} | 1 +
 lms/envs/common.py                   | 2 ++
 lms/envs/{prod.py => yaml-config.py} | 6 ++----
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename cms/envs/{prod.py => yaml-config.py} (99%)
 rename lms/envs/{prod.py => yaml-config.py} (98%)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 84a43de7ef..d336a4939b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -769,3 +769,5 @@ CAS_ATTRIBUTE_CALLBACK = None
 MICROSITE_ROOT_DIR = ''
 SEGMENT_IO = False
 DATADOG = {}
+ADDL_INSTALLED_APPS = []
+LOCAL_LOGLEVEL = 'INFO'
diff --git a/cms/envs/prod.py b/cms/envs/yaml-config.py
similarity index 99%
rename from cms/envs/prod.py
rename to cms/envs/yaml-config.py
index fa8b2215b3..a4580654d6 100644
--- a/cms/envs/prod.py
+++ b/cms/envs/yaml-config.py
@@ -196,6 +196,7 @@ for app in ADDL_INSTALLED_APPS:
 
 
 LOGGING = get_logger_config(LOG_DIR,
+                            local_loglevel=LOCAL_LOGLEVEL,
                             logging_env=LOGGING_ENV,
                             debug=False,
                             service_variant=SERVICE_VARIANT)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 8f184fff7d..28423dc8c8 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1921,3 +1921,5 @@ SEGMENT_IO_LMS = False
 
 MONGODB_LOG = {}
 SESSION_INACTIVITY_TIMEOUT_IN_SECONDS = None
+ADDL_INSTALLED_APPS = []
+LOCAL_LOGLEVEL = 'INFO'
diff --git a/lms/envs/prod.py b/lms/envs/yaml-config.py
similarity index 98%
rename from lms/envs/prod.py
rename to lms/envs/yaml-config.py
index 7e1a4be2a8..1a06702029 100644
--- a/lms/envs/prod.py
+++ b/lms/envs/yaml-config.py
@@ -207,14 +207,12 @@ BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
 LANGUAGE_DICT = dict(LANGUAGES)
 
 # Additional installed apps
-for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):
+for app in ADDL_INSTALLED_APPS:
     INSTALLED_APPS += (app,)
 
-local_loglevel = ENV_TOKENS.get('LOCAL_LOGLEVEL', 'INFO')
-
 LOGGING = get_logger_config(LOG_DIR,
                             logging_env=LOGGING_ENV,
-                            local_loglevel=local_loglevel,
+                            local_loglevel=LOCAL_LOGLEVEL,
                             debug=False,
                             service_variant=SERVICE_VARIANT)