From: dyh <dengyuanhong@chinamobile.com>
Date: Thu, 4 Feb 2021 03:04:42 +0000 (+0800)
Subject: Remove dependency on onaplogging
X-Git-Tag: 1.0.10~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=modeling%2Fetsicatalog.git;a=commitdiff_plain;h=2e7f069a2474f6dc9405b801b80d2b013b5d5e3f

Remove dependency on onaplogging

Change-Id: I4a0c3b60b6383669d785a600fc2289c4b80afdc1
Issue-ID: MODELING-493
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
---

diff --git a/catalog/settings.py b/catalog/settings.py
index 3e5b919..0974b5e 100644
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -15,6 +15,7 @@
 import os
 import platform
 import sys
+import yaml
 from logging import config as log_config
 
 from catalog.pub.config import config as pub_config
@@ -175,9 +176,15 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
     }
 else:
     LOGGING_CONFIG = None
+    log_path = '/var/log/onap/modeling/etsicatalog'
+    if not os.path.exists(log_path):
+        os.makedirs(log_path)
+
     # yaml configuration of logging
     LOGGING_FILE = os.path.join(BASE_DIR, 'catalog/log.yml')
-    log_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)
+    log_config.dictConfig(config=logging_yaml)
 
 if 'test' in sys.argv:
     pub_config.REG_TO_MSB_WHEN_START = False
diff --git a/requirements.txt b/requirements.txt
index 818289c..addba81 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,4 +27,5 @@ swagger-spec-validator>=2.1.0
 # uwsgi for parallel processing
 uwsgi
 
-apscheduler==3.6.3
\ No newline at end of file
+apscheduler==3.6.3
+PyYAML==5.3.1
\ No newline at end of file