diff options
| -rw-r--r-- | vio/requirements.txt | 3 | ||||
| -rwxr-xr-x | vio/run.sh | 8 | ||||
| -rw-r--r-- | vio/vio/pub/config/log.yml | 26 | ||||
| -rw-r--r-- | vio/vio/settings.py | 38 |
4 files changed, 43 insertions, 32 deletions
diff --git a/vio/requirements.txt b/vio/requirements.txt index 6cecedc..8d5a51c 100644 --- a/vio/requirements.txt +++ b/vio/requirements.txt @@ -20,3 +20,6 @@ django-nose>=1.4.0 coverage==4.2 mock==2.0.0 unittest_xml_reporting==1.12.0 + +# for onap logging +onappylog>=1.0.5 @@ -23,8 +23,12 @@ sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" vio/pub/config/ nohup python manage.py runserver 0.0.0.0:9004 2>&1 & -while [ ! -f logs/runtime_vio.log ]; do +logDir="/var/log/onap/multicloiud/vio" +if [ ! -x $logDir ]; then + mkdir -p $logDir +fi +while [ ! -f $logDir/vio.log ]; do sleep 1 done -tail -F logs/runtime_vio.log +tail -F $logDir/vio.log diff --git a/vio/vio/pub/config/log.yml b/vio/vio/pub/config/log.yml new file mode 100644 index 0000000..82eb814 --- /dev/null +++ b/vio/vio/pub/config/log.yml @@ -0,0 +1,26 @@ +version: 1 +disable_existing_loggers: False + +loggers: + vio: + handlers: [vio_handler] + level: "DEBUG" + propagate: False +handlers: + vio_handler: + level: "DEBUG" + class: "logging.handlers.RotatingFileHandler" + filename: "/var/log/onap/multicloud/vio/vio.log" + formatter: "mdcFormat" + maxBytes: 1024*1024*50 + backupCount: 10 +formatters: + standard: + format: "%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s" + mdcFormat: + format: "%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:[%(mdc)s]: %(message)s" + mdcfmt: "{requestID}" + datefmt: "%Y-%m-%d %H:%M:%S" + (): onaplogging.mdcformatter.MDCFormatter + + diff --git a/vio/vio/settings.py b/vio/vio/settings.py index c0a9209..e82b523 100644 --- a/vio/vio/settings.py +++ b/vio/vio/settings.py @@ -12,7 +12,9 @@ import os import sys - +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__))) @@ -83,36 +85,12 @@ TIME_ZONE = 'UTC' 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': { - 'vio_handler': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(BASE_DIR, 'logs/runtime_vio.log'), - 'formatter': 'standard', - 'maxBytes': 1024 * 1024 * 50, - 'backupCount': 5, - }, - }, - 'loggers': { - 'vio': { - 'handlers': ['vio_handler'], - 'level': 'DEBUG', - 'propagate': False - }, - } -} +LOGGING_CONFIG = None +# yaml configuration of logging +LOGGING_FILE = os.path.join(BASE_DIR, 'vio/pub/config/log.yml') +config.yamlConfig(filepath=LOGGING_FILE, watchDog=True) + if 'test' in sys.argv: from vio.pub.config import config |