diff options
Diffstat (limited to 'res/res/settings.py')
-rw-r--r-- | res/res/settings.py | 67 |
1 files changed, 38 insertions, 29 deletions
diff --git a/res/res/settings.py b/res/res/settings.py index b62dad0..f15deff 100644 --- a/res/res/settings.py +++ b/res/res/settings.py @@ -19,6 +19,9 @@ import redisco from res.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD from res.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT +from logging import config +from onaplogging import monkey +monkey.patch_all() # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -58,6 +61,7 @@ MIDDLEWARE_CLASSES = [ 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'res.middleware.LogContextMiddleware', ] ROOT_URLCONF = 'res.urls' @@ -118,36 +122,41 @@ TIME_ZONE = 'UTC' # https://docs.djangoproject.com/en/1.6/howto/static-files/ STATIC_URL = '/static/' +# +# LOGGING = { +# 'version': 1, +# 'disable_existing_loggers': True, +# 'formatters': { +# 'standard': { +# 'format': '%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s', +# }, +# }, +# 'filters': { +# }, +# 'handlers': { +# 'res_handler': { +# 'level': 'DEBUG', +# 'class': 'logging.handlers.RotatingFileHandler', +# 'filename': os.path.join(BASE_DIR, 'logs/runtime_res.log'), +# 'formatter': 'standard', +# 'maxBytes': 1024 * 1024 * 50, +# 'backupCount': 5, +# }, +# }, +# +# 'loggers': { +# 'res': { +# 'handlers': ['res_handler'], +# 'level': 'DEBUG', +# 'propagate': False +# }, +# } +# } +LOGGING_CONFIG = None +# yaml configuration of logging +LOGGING_FILE = os.path.join(BASE_DIR, 'res/log.yml') +config.yamlConfig(filepath=LOGGING_FILE, watchDog=True) -LOGGING = { - 'version': 1, - 'disable_existing_loggers': True, - 'formatters': { - 'standard': { - 'format': '%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s', - }, - }, - 'filters': { - }, - 'handlers': { - 'res_handler': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(BASE_DIR, 'logs/runtime_res.log'), - 'formatter': 'standard', - 'maxBytes': 1024 * 1024 * 50, - 'backupCount': 5, - }, - }, - - 'loggers': { - 'res': { - 'handlers': ['res_handler'], - 'level': 'DEBUG', - 'propagate': False - }, - } -} if 'test' in sys.argv: from res.pub.config import config |