diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 34312eb25b..6bee74ffb9 100644 --- a/cms/envs/aws.py +++ b/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 ################################ diff --git a/cms/envs/dev.py b/cms/envs/dev.py index e5548df2d4..e00c52a13e 100644 --- a/cms/envs/dev.py +++ b/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 diff --git a/cms/envs/logsettings.py b/cms/envs/logsettings.py deleted file mode 100644 index 3683314d02..0000000000 --- a/cms/envs/logsettings.py +++ /dev/null @@ -1,96 +0,0 @@ -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 - }, - } - } diff --git a/lms/envs/logsettings.py b/common/lib/logsettings.py similarity index 100% rename from lms/envs/logsettings.py rename to common/lib/logsettings.py diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 7863dca065..c552f0c00e 100644 --- a/lms/envs/aws.py +++ b/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 ################################ diff --git a/lms/envs/dev.py b/lms/envs/dev.py index 9114f099d4..b89b0246f3 100644 --- a/lms/envs/dev.py +++ b/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 diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py index dda08a000d..0212d8b550 100644 --- a/lms/envs/dev_edx4edx.py +++ b/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(): diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py index 9a456daecd..7e0e0f001c 100644 --- a/lms/envs/dev_ike.py +++ b/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 diff --git a/lms/envs/static.py b/lms/envs/static.py index 179f9160c5..16a668911b 100644 --- a/lms/envs/static.py +++ b/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 diff --git a/lms/envs/test.py b/lms/envs/test.py index 34108256e9..d1cc10f4d5 100644 --- a/lms/envs/test.py +++ b/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 diff --git a/lms/envs/test_ike.py b/lms/envs/test_ike.py index 8bdecb3c8f..d0169c5043 100644 --- a/lms/envs/test_ike.py +++ b/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