Move logsettings to common, so that it's shared between cms and lms

cms/envs/aws.py

@@ -3,7 +3,7 @@ This is the default template for our main set of AWS servers.
 """
 import json
 
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 from .common import *
 
 ############################### ALWAYS THE SAME ################################

cms/envs/dev.py

@@ -2,7 +2,7 @@
 This config file runs the simplest dev environment"""
 
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 
 import logging
 import sys

cms/envs/logsettings.py

-import os
-import os.path
-import platform
-import sys
-
-def get_logger_config(log_dir,
-                      logging_env="no_env",
-                      tracking_filename=None,
-                      syslog_addr=None,
-                      debug=False):
-    """Return the appropriate logging config dictionary. You should assign the
-    result of this to the LOGGING var in your settings. The reason it's done
-    this way instead of registering directly is because I didn't want to worry
-    about resetting the logging state if this is called multiple times when
-    settings are extended."""
-
-    # If we're given an explicit place to put tracking logs, we do that (say for
-    # debugging). However, logging is not safe for multiple processes hitting
-    # the same file. So if it's left blank, we dynamically create the filename
-    # based on the PID of this worker process.
-    if tracking_filename:
-        tracking_file_loc = os.path.join(log_dir, tracking_filename)
-    else:
-        pid = os.getpid() # So we can log which process is creating the log
-        tracking_file_loc = os.path.join(log_dir, "tracking_{0}.log".format(pid))
-
-    hostname = platform.node().split(".")[0]
-    syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s [{hostname} " +
-                     " %(process)d] [%(filename)s:%(lineno)d] - %(message)s").format(
-                        logging_env=logging_env, hostname=hostname)
-
-    handlers = ['console'] if debug else ['console', 'syslogger', 'newrelic']
-
-    return {
-        'version': 1,
-        'disable_existing_loggers': False,
-        'formatters' : {
-            'standard' : {
-                'format' : '%(asctime)s %(levelname)s %(process)d [%(name)s] %(filename)s:%(lineno)d - %(message)s',
-            },
-            'syslog_format' : { 'format' : syslog_format },
-            'raw' : { 'format' : '%(message)s' },
-        },
-        'handlers' : {
-            'console' : {
-                'level' : 'DEBUG' if debug else 'INFO',
-                'class' : 'logging.StreamHandler',
-                'formatter' : 'standard',
-                'stream' : sys.stdout,
-            },
-            'syslogger' : {
-                'level' : 'INFO',
-                'class' : 'logging.handlers.SysLogHandler',
-                'address' : syslog_addr,
-                'formatter' : 'syslog_format',
-            },
-            'tracking' : {
-                'level' : 'DEBUG',
-                'class' : 'logging.handlers.WatchedFileHandler',
-                'filename' : tracking_file_loc,
-                'formatter' : 'raw',
-            },
-            'newrelic' : {
-                'level': 'ERROR',
-                'class': 'newrelic_logging.NewRelicHandler',
-                'formatter': 'raw',
-            }
-        },
-        'loggers' : {
-            'django' : {
-                'handlers' : handlers,
-                'propagate' : True,
-                'level' : 'INFO'
-            },
-            'tracking' : {
-                'handlers' : ['tracking'],
-                'level' : 'DEBUG',
-                'propagate' : False,
-            },
-            '' : {
-                'handlers' : handlers,
-                'level' : 'DEBUG',
-                'propagate' : False
-            },
-            'mitx' : {
-                'handlers' : handlers,
-                'level' : 'DEBUG',
-                'propagate' : False
-            },
-            'keyedcache' : {
-                'handlers' : handlers,
-                'level' : 'DEBUG',
-                'propagate' : False
-            },
-        }
-    }

lms/envs/aws.py

@@ -8,7 +8,7 @@ Common traits:
 """
 import json
 
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 from .common import *
 
 ############################### ALWAYS THE SAME ################################

lms/envs/dev.py

@@ -8,7 +8,7 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 
 DEBUG = True
 TEMPLATE_DEBUG = True

lms/envs/dev_edx4edx.py

@@ -14,7 +14,7 @@ if 'eecs1' in socket.gethostname():
     MITX_ROOT_URL = '/mitx2'
 
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 from .dev import *
 
 if 'eecs1' in socket.gethostname():

lms/envs/dev_ike.py

@@ -8,7 +8,7 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 from .dev import *
 import socket
 

lms/envs/static.py

@@ -8,7 +8,7 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 
 STATIC_GRAB = True
 

lms/envs/test.py

@@ -8,7 +8,7 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 import os
 from path import path
 

lms/envs/test_ike.py

@@ -8,7 +8,7 @@ sessions. Assumes structure:
         /log  # Where we're going to write log files
 """
 from .common import *
-from .logsettings import get_logger_config
+from logsettings import get_logger_config
 import os
 
 DEBUG = True