Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate overrides into base config.

Browse Source 
They used to be in a conditional but aren't anymore so we don't need to have
them be separate.
This commit is contained in:
Feanil Patel
2018-01-31 11:51:47 -05:00
parent caff4b5720
commit 8d84e8b4a2
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
openedx/core/lib/logsettings.py
View File

@@ -65,6 +65,20 @@ def get_logger_config(log_dir,
'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
},
'local': {
'level': local_loglevel,
'class': 'logging.handlers.SysLogHandler',
'address': '/dev/log',
'formatter': 'syslog_format',
'facility': SysLogHandler.LOG_LOCAL0,
},
'tracking': {
'level': 'DEBUG',
'class': 'logging.handlers.SysLogHandler',
'address': '/dev/log',
'facility': SysLogHandler.LOG_LOCAL1,
'formatter': 'raw',
},
},
'loggers': {
'tracking': {
@@ -74,7 +88,7 @@ def get_logger_config(log_dir,
},
'': {
'handlers': handlers,
'level': 'DEBUG',
'level': 'INFO',
'propagate': False
},
'django.request': {
@@ -82,31 +96,14 @@ def get_logger_config(log_dir,
'level': 'ERROR',
'propagate': True,
},
# requests is so loud at INFO (logs every connection) that we
# force it to warn in production environments
'requests.packages.urllib3': {
'level': 'WARN'
}
}
}
# for production environments we will only
# log INFO and up
logger_config['loggers']['']['level'] = 'INFO'
# requests is so loud at INFO (logs every connection) that we force it to warn in production environments
logger_config['loggers']['requests.packages.urllib3'] = {'level': 'WARN'}
logger_config['handlers'].update({
'local': {
'level': local_loglevel,
'class': 'logging.handlers.SysLogHandler',
'address': '/dev/log',
'formatter': 'syslog_format',
'facility': SysLogHandler.LOG_LOCAL0,
},
'tracking': {
'level': 'DEBUG',
'class': 'logging.handlers.SysLogHandler',
'address': '/dev/log',
'facility': SysLogHandler.LOG_LOCAL1,
'formatter': 'raw',
},
})
return logger_config