Skip to content
Snippets Groups Projects
Commit acd39bc1 authored by Tanner Prestegard's avatar Tanner Prestegard Committed by Alexander Pace
Browse files

making logging identical between production and test; expanding overall logging

parent 0507b6be
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
settings/default.py
+ 58
− 14
View file @ acd39bc1
......@@ -26,15 +26,15 @@ TWIML_BASE_URL = 'https://handler.twilio.com/twiml/'
#EMAIL_HOST = 'gravity.phys.uwm.edu'
EMAIL_HOST = 'localhost'
SERVER_EMAIL = 'GraceDB <gracedb@gracedb.cgca.uwm.edu>'
ALERT_EMAIL_FROM = "GraceDB <gracedb@gracedb.cgca.uwm.edu>"
ALERT_EMAIL_FROM = SERVER_EMAIL
ALERT_EMAIL_TO = []
ALERT_EMAIL_BCC = []
ALERT_TEST_EMAIL_FROM = "GraceDB TEST <gracedb@gracedb.cgca.uwm.edu>"
ALERT_TEST_EMAIL_FROM = "GraceDB TESTING <gracedb@gracedb.cgca.uwm.edu>"
ALERT_TEST_EMAIL_TO = []
# LVAlert and LVAlert Overseer settings
ALERT_XMPP_SERVERS = ["lvalert.cgca.uwm.edu"]
LVALERT_SEND_EXECUTABLE = '/home/gracedb/djangoenv/bin/lvalert_send'
ALERT_XMPP_SERVERS = ["lvalert.cgca.uwm.edu"]
USE_LVALERT_OVERSEER = True
# For each lvalert server, a separate instance of the lvalert_overseer
# must be running and listening on a distinct port.
......@@ -353,36 +353,69 @@ CONTROL_ROOM_IPS = {
# Everything below here is logging. ###########################################
# The following Log settings are for a performance metric.
LOG_ROOT = '/home/gracedb/logs'
# Filter objects to separate out each level of alert.
# Currently unused (TP 1/6/2017)
class infoOnlyFilter(logging.Filter):
def filter(self,record):
if record.levelname=='INFO':
return 1
return 0
LOG_ROOT = '/home/gracedb/logs'
LOG_FILE_SIZE = 1024*1024 # 1 MB
LOG_FILE_BAK_CT = 10
LOG_FORMAT = 'extra_verbose'
LOG_LEVEL = 'DEBUG'
# Note that mode for log files is 'a' (append) by default
# The 'level' specifier on the handle is optional, and we
# don't need it since we're using custom filters.
LOGGING = {
'version': 1,
'disable_existing_loggers' : True,
'disable_existing_loggers': True,
'formatters': {
'simple': {
'format': '%(asctime)s: %(message)s',
'datefmt': '%Y-%m-%dT%H:%M:%S',
'format': '%(asctime)s | %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
},
'verbose': {
'format': '%(asctime)s | %(name)s | %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
},
'extra_verbose': {
'format': '%(asctime)s.%(msecs)03d | %(name)s | %(levelname)s | ' \
+ '%(filename)s, line %(lineno)s | %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
}
},
'handlers': {
'null': {
'level': 'DEBUG',
'class': 'django.utils.log.NullHandler',
},
'debug_file': {
'class': 'logging.handlers.ConcurrentRotatingFileHandler',
'formatter': LOG_FORMAT,
'filename': '%s/gracedb_debug.log' % LOG_ROOT,
'maxBytes': LOG_FILE_SIZE,
'backupCount': LOG_FILE_BAK_CT,
'level': 'DEBUG',
},
'info_file': {
'class': 'logging.handlers.TimedRotatingFileHandler',
'formatter': 'simple',
'filename': '%s/gracedb_info.log' % LOG_ROOT,
'when': 'midnight',
'backupCount': 10,
'backupCount': LOG_FILE_BAK_CT,
'level': 'INFO',
},
'error_file': {
'class': 'logging.handlers.ConcurrentRotatingFileHandler',
'formatter': LOG_FORMAT,
'filename': '%s/gracedb_error.log' % LOG_ROOT,
'maxBytes': LOG_FILE_SIZE,
'backupCount': LOG_FILE_BAK_CT,
'level': 'ERROR',
},
'performance_file': {
'class': 'logging.FileHandler',
......@@ -401,19 +434,30 @@ LOGGING = {
'level': 'INFO',
},
'gracedb': {
'handlers': ['info_file'],
'handlers': ['debug_file','info_file','error_file'],
'propagate': True,
'level': 'INFO',
'level': LOG_LEVEL,
},
'ligoauth': {
'handlers': ['debug_file','info_file','error_file'],
'propagate': True,
'level': LOG_LEVEL,
},
'userprofile': {
'handlers': ['debug_file','info_file','error_file'],
'propagate': True,
'level': LOG_LEVEL,
},
'middleware': {
'handlers': ['performance_file'],
'propagate': True,
'level': 'INFO',
},
'django.request': {
'django.request': {
'handlers': ['mail_admins'],
'propagate': False,
'level': 'ERROR',
'propagate': False,
},
},
}
settings/test.py
+ 4
− 105
View file @ acd39bc1
from settings_secret import *
from settings_secret import TEST_DB_PASSWORD
import logging
from cloghandler import ConcurrentRotatingFileHandler
......@@ -41,7 +41,7 @@ CACHES = {
# Email settings
SERVER_EMAIL = "GraceDB Test <gracedb@gracedb-test.cgca.uwm.edu>"
ALERT_EMAIL_FROM = "GraceDB Test <gracedb@gracedb-test.cgca.uwm.edu>"
ALERT_EMAIL_FROM = SERVER_EMAIL
ALERT_EMAIL_TO = []
ALERT_EMAIL_BCC = []
ALERT_TEST_EMAIL_FROM = \
......@@ -71,13 +71,13 @@ XMPP_ALERT_CHANNELS = [
]
MIDDLEWARE_CLASSES = [
'middleware.performance.PerformanceMiddleware',
'middleware.accept.AcceptMiddleware',
'middleware.cli.CliExceptionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'ligoauth.middleware.auth.LigoAuthMiddleware',
'middleware.performance.PerformanceMiddleware',
#'debug_toolbar.middleware.DebugToolbarMiddleware',
#'debug_panel.middleware.DebugPanelMiddleware',
#'middleware.profiling.ProfileMiddleware',
......@@ -100,114 +100,13 @@ INSTALLED_APPS = (
)
INTERNAL_IPS = (
#'129.89.57.72',
'129.89.57.83',
)
# Why are these different from production?
CONTROL_ROOM_IPS = {
'H1': '108.45.69.217',
'L1': '129.2.92.124',
# 'L1': '129.89.57.83',
}
# Everything below here is logging. ###########################################
LOG_ROOT = '/home/gracedb/logs'
LOG_FILE_SIZE = 1024*1024 # 1 MB
LOG_FILE_BAK_CT = 3
LOG_FORMAT = 'extra_verbose'
LOG_LEVEL = 'DEBUG'
# Note that mode for log files is 'a' (append) by default
# The 'level' specifier on the handle is optional, and we
# don't need it since we're using custom filters.
LOGGING = {
'version': 1,
'disable_existing_loggers' : True,
'formatters': {
'simple': {
'format': '%(asctime)s | %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
},
'verbose': {
'format': '%(asctime)s | %(name)s | %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
},
'extra_verbose': {
'format': '%(asctime)s.%(msecs)03d | %(name)s | %(levelname)s | ' \
+ '%(filename)s, line %(lineno)s:\n\t%(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
}
},
'handlers': {
'null': {
'level': 'DEBUG',
'class': 'django.utils.log.NullHandler',
},
'info_file': {
'class': 'logging.handlers.TimedRotatingFileHandler',
'formatter': 'simple',
'filename': '%s/gracedb_info.log' % LOG_ROOT,
'when': 'midnight',
'backupCount': 10,
'level': 'INFO',
},
'debug_file': {
'class': 'logging.handlers.RotatingFileHandler',
'formatter': LOG_FORMAT,
'filename': '%s/gracedb_debug.log' % LOG_ROOT,
'maxBytes': LOG_FILE_SIZE,
'backupCount': LOG_FILE_BAK_CT,
'level': 'DEBUG',
},
'test_file': {
'class': 'logging.handlers.ConcurrentRotatingFileHandler',
'formatter': LOG_FORMAT,
'filename': '%s/gracedb_test.log' % LOG_ROOT,
'maxBytes': LOG_FILE_SIZE,
'backupCount': LOG_FILE_BAK_CT,
'level': 'DEBUG',
},
'performance_file': {
'class': 'logging.FileHandler',
'formatter': 'simple',
'filename': '%s/gracedb_performance.log' % LOG_ROOT,
},
'mail_admins': {
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django': {
'handlers': ['null'],
'propagate': True,
'level': 'INFO',
},
'gracedb': {
'handlers': ['debug_file','info_file','test_file'],
'propagate': True,
'level': LOG_LEVEL,
},
'ligoauth': {
'handlers': ['debug_file'],
'propagate': True,
'level': LOG_LEVEL,
},
'userprofile': {
'handlers': ['debug_file'],
'propagate': True,
'level': LOG_LEVEL,
},
'middleware': {
'handlers': ['performance_file'],
'propagate': True,
'level': 'INFO',
},
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': False,
},
},
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment