Remove dependency on onaplogging in vnflcm

[vfc/gvnfm/vnflcm.git] / lcm / lcm / settings.py

diff --git a/lcm/lcm/settings.py b/lcm/lcm/settings.py
index a71a4cd..b065464 100644 (file)
--- a/lcm/lcm/settings.py
+++ b/lcm/lcm/settings.py
@@ -17,12 +17,11 @@ import sys
 import platform
 
 import lcm.pub.redisco
+import yaml
 
 from lcm.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
 from lcm.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__)))
@@ -70,7 +69,6 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'lcm.middleware.LogContextMiddleware'
 ]
 
 ROOT_URLCONF = 'lcm.urls'
@@ -165,8 +163,15 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
     }
 else:
     LOGGING_CONFIG = None
+
+    log_path = '/var/log/onap/vfc/gvnfm-vnflcm'
+    if not os.path.exists(log_path):
+        os.makedirs(log_path)
+
     LOGGING_FILE = os.path.join(BASE_DIR, 'lcm/log.yml')
-    config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
+    with open(file=LOGGING_FILE, mode='r', encoding="utf-8")as file:
+        logging_yaml = yaml.load(stream=file, Loader=yaml.FullLoader)
+    config.dictConfig(config=logging_yaml)
 
 
 if 'test' in sys.argv: