diff --git a/notesserver/settings/logger.py b/notesserver/settings/logger.py index be084b9e..a0dbcdb3 100644 --- a/notesserver/settings/logger.py +++ b/notesserver/settings/logger.py @@ -15,10 +15,6 @@ def build_logging_config(): """ Return the appropriate logging config dictionary. You should assign the result of this to the LOGGING var in your settings. - If dev_env is set to true logging will not be done via local rsyslogd, - instead, application logs will be dropped in log_dir. - "edx_filename" is ignored unless dev_env is set to true since otherwise - logging is handled by rsyslogd. """ # Revert to INFO if an invalid string is passed in @@ -37,21 +33,19 @@ def build_logging_config(): syslog_format = ( "[service_variant={service_variant}]" "[%(name)s][env:{logging_env}] %(levelname)s " - "[{hostname} %(process)d] [%(filename)s:%(lineno)d] " + "[{hostname} %(process)d] [%(filename)s:%(lineno)d] " "- %(message)s" ).format(service_variant=service_variant, logging_env=logging_env, hostname=hostname) - if debug: - handlers = ['console'] - else: - handlers = ['local'] + handlers = ['console'] logger_config = { 'version': 1, 'disable_existing_loggers': False, 'formatters': { 'standard': { - 'format': '%(asctime)s %(levelname)s %(process)d ' '[%(name)s] %(filename)s:%(lineno)d - %(message)s', + 'format': '%(asctime)s,%(msecs)03d %(levelname)s [%(name)s] [%(process)d] - %(message)s', + 'datefmt': '%Y-%m-%dT%H:%M:%S', }, 'syslog_format': {'format': syslog_format}, 'raw': {'format': '%(message)s'}, @@ -65,38 +59,10 @@ def build_logging_config(): }, }, 'loggers': { - 'django': {'handlers': handlers, 'propagate': True, 'level': 'INFO'}, - "elasticsearch.trace": {'handlers': handlers, 'level': 'WARNING', 'propagate': False}, - '': {'handlers': handlers, 'level': 'DEBUG', 'propagate': False}, + 'django': {'handlers': handlers, 'propagate': True, 'level': 'INFO', 'formatter': 'standard'}, + "elasticsearch.trace": {'handlers': handlers, 'level': 'WARNING', 'propagate': False, 'formatter': 'standard'}, + '': {'handlers': handlers, 'level': 'DEBUG', 'propagate': False, 'formatter': 'standard'}, }, } - if dev_env: - edx_file_loc = os.path.join(log_dir, edx_filename) - logger_config['handlers'].update( - { - 'local': { - 'class': 'logging.handlers.RotatingFileHandler', - 'level': local_loglevel, - 'formatter': 'standard', - 'filename': edx_file_loc, - 'maxBytes': 1024 * 1024 * 2, - 'backupCount': 5, - } - } - ) - else: - logger_config['handlers'].update( - { - 'local': { - 'level': local_loglevel, - 'class': 'logging.handlers.SysLogHandler', - # Use a different address for Mac OS X - 'address': '/var/run/syslog' if sys.platform == "darwin" else '/dev/log', - 'formatter': 'syslog_format', - 'facility': SysLogHandler.LOG_LOCAL0, - } - } - ) - return logger_config