diff options
author | dyh <dengyuanhong@chinamobile.com> | 2021-02-04 11:04:42 +0800 |
---|---|---|
committer | dyh <dengyuanhong@chinamobile.com> | 2021-02-04 11:05:20 +0800 |
commit | 2e7f069a2474f6dc9405b801b80d2b013b5d5e3f (patch) | |
tree | 734d339fb70a47f93ecbd3450252d24de91a4095 | |
parent | f9d535dc3f82ee761acad6daeb46376b4627ac5f (diff) |
Remove dependency on onaplogging
Change-Id: I4a0c3b60b6383669d785a600fc2289c4b80afdc1
Issue-ID: MODELING-493
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
-rw-r--r-- | catalog/settings.py | 9 | ||||
-rw-r--r-- | requirements.txt | 3 |
2 files changed, 10 insertions, 2 deletions
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 |