update link to upper-constraints.txt

[modeling/etsicatalog.git] / catalog / settings.py

diff --git a/catalog/settings.py b/catalog/settings.py
index 81127b8..0974b5e 100644 (file)
--- a/catalog/settings.py
+++ b/catalog/settings.py
@@ -15,15 +15,12 @@
 import os
 import platform
 import sys
+import yaml
 from logging import config as log_config
 
-from onaplogging import monkey
-
 from catalog.pub.config import config as pub_config
 from catalog.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 
-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__)))
 
@@ -86,7 +83,6 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'catalog.middleware.LogContextMiddleware',
 ]
 
 ROOT_URLCONF = 'catalog.urls'
@@ -180,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