Cleaning up the envs/* files so that they will work with gunicorn_django

envs/aws.py

@@ -8,7 +8,8 @@ Common traits:
 """
 import json
 
-from common import *
+from envs.logsettings import get_logger_config
+from envs.common import *
 
 ############################### ALWAYS THE SAME ################################
 DEBUG = False
@@ -31,10 +32,10 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']
 
 CACHES = ENV_TOKENS['CACHES']
 
-LOGGING = logsettings.get_logger_config(LOG_DIR, 
-                                        logging_env=ENV_TOKENS['LOGGING_ENV'],
-                                        syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
-                                        debug=False)
+LOGGING = get_logger_config(LOG_DIR, 
+                            logging_env=ENV_TOKENS['LOGGING_ENV'],
+                            syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
+                            debug=False)
 
 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.

envs/common.py

@@ -24,8 +24,7 @@ import tempfile
 import djcelery
 from path import path
 
-from askbotsettings import * # this is where LIVESETTINGS_OPTIONS comes from
-import logsettings
+from envs.askbotsettings import * # this is where LIVESETTINGS_OPTIONS comes from
 
 ################################### FEATURES ###################################
 COURSEWARE_ENABLED = True

envs/content.py

@@ -2,7 +2,7 @@
 These are debug machines used for content creators, so they're kind of a cross
 between dev machines and AWS machines.
 """
-from aws import *
+from envs.aws import *
 
 DEBUG = True
 TEMPLATE_DEBUG = True

envs/dev.py

@@ -7,15 +7,16 @@ sessions. Assumes structure:
         /mitx # The location of this repo
         /log  # Where we're going to write log files
 """
-from common import *
+from envs.common import *
+from envs.logsettings import get_logger_config
 
 DEBUG = True
 TEMPLATE_DEBUG = True
 
-LOGGING = logsettings.get_logger_config(ENV_ROOT / "log", 
-                                        logging_env="dev",
-                                        tracking_filename="tracking.log",
-                                        debug=True)
+LOGGING = get_logger_config(ENV_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=True)
 
 DATABASES = {
     'default': {

envs/devplus.py

@@ -13,7 +13,7 @@ Dir structure:
         /log  # Where we're going to write log files
 
 """
-from dev import *
+from envs.dev import *
 
 DATABASES = {
     'default': {

envs/static.py

@@ -7,14 +7,15 @@ sessions. Assumes structure:
         /mitx # The location of this repo
         /log  # Where we're going to write log files
 """
-from common import *
+from envs.common import *
+from envs.logsettings import get_logger_config
 
 STATIC_GRAB = True
 
-LOGGING = logsettings.get_logger_config(ENV_ROOT / "log", 
-                                        logging_env="dev",
-                                        tracking_filename="tracking.log",
-                                        debug=False)
+LOGGING = get_logger_config(ENV_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=False)
 
 DATABASES = {
     'default': {

envs/test.py

@@ -7,7 +7,8 @@ sessions. Assumes structure:
         /mitx # The location of this repo
         /log  # Where we're going to write log files
 """
-from common import *
+from envs.common import *
+from envs.logsettings import get_logger_config
 import os
 
 INSTALLED_APPS = [
@@ -35,10 +36,10 @@ MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates',
                           DATA_DIR / 'info',
                           DATA_DIR / 'problems']
 
-LOGGING = logsettings.get_logger_config(TEST_ROOT / "log", 
-                                        logging_env="dev",
-                                        tracking_filename="tracking.log",
-                                        debug=True)
+LOGGING = get_logger_config(TEST_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=True)
 
 DATABASES = {
     'default': {