Remove dependency on onaplogging in vnfres

Change-Id: I50d0bd01a28fc63f8d5f5e8fd790a2a0a1df4b9f
Issue-ID: VFC-1811
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

diff --git a/res/requirements.txt b/res/requirements.txt
index c3a9af9..46c4baf 100644 (file)
--- a/res/requirements.txt
+++ b/res/requirements.txt
@@ -29,4 +29,6 @@ swagger-spec-validator>=2.1.0
 onappylog>=1.0.9
 
 # uwsgi for parallel processing
-uwsgi
\ No newline at end of file
+uwsgi
+
+PyYAML==5.3.1
\ No newline at end of file

diff --git a/res/res/log.yml b/res/res/log.yml
index 135c715..7ab4aec 100644 (file)
--- a/res/res/log.yml
+++ b/res/res/log.yml
@@ -26,7 +26,7 @@ handlers:
             "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/vfc/gvnfm-vnfres/runtime_res.log"
         formatter:
-            "mdcFormat"
+            "standard"
         maxBytes: 52428800
         backupCount: 10
     django_handler:
@@ -42,9 +42,3 @@ formatters:
     standard:
         format:
             "%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s"
-    mdcFormat:
-        format:
-            "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s \t"
-        mdcfmt: "{requestID} {invocationID} {serviceName} {serviceIP}"
-        datefmt: "%Y-%m-%d %H:%M:%S"
-        (): onaplogging.mdcformatter.MDCFormatter

diff --git a/res/res/middleware.py b/res/res/middleware.py
deleted file mode 100644 (file)
index 4df1e8f..0000000
--- a/res/res/middleware.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2017-2018 ZTE, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-import uuid
-from onaplogging.mdcContext import MDC
-
-from res.pub.config.config import FORWARDED_FOR_FIELDS, SERVICE_NAME
-
-
-class LogContextMiddleware(object):
-    #  the last IP behind multiple proxies,  if no exist proxies
-    #  get local host ip.
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def _getLastIp(self, request):
-
-        ip = ""
-        try:
-            for field in FORWARDED_FOR_FIELDS:
-                if field in request.META:
-                    if ',' in request.META[field]:
-                        parts = request.META[field].split(',')
-                        ip = parts[-1].strip().split(":")[0]
-                    else:
-                        ip = request.META[field].split(":")[0]
-
-            if ip == "":
-                ip = request.META.get("HTTP_HOST").split(":")[0]
-
-        except Exception:
-            pass
-
-        return ip
-
-    def process_request(self, request):
-        # Fetch TRANSACTIONID Id and pass to plugin server
-        ReqeustID = request.META.get("HTTP_X_ONAP-RequestID", None)
-        if ReqeustID is None:
-            ReqeustID = uuid.uuid3(uuid.NAMESPACE_URL, SERVICE_NAME)
-            request.META["HTTP_X_ONAP-RequestID"] = ReqeustID
-        MDC.put("requestID", ReqeustID)
-        # generate the unique  id
-        InovocationID = uuid.uuid3(uuid.NAMESPACE_DNS, SERVICE_NAME)
-        MDC.put("invocationID", InovocationID)
-        MDC.put("serviceName", SERVICE_NAME)
-        # access ip
-        MDC.put("serviceIP", self._getLastIp(request))
-
-        return None
-
-    def process_response(self, request, response):
-        MDC.clear()
-        return response
-
-    def __call__(self, request):
-        self.process_request(request)
-        response = self.get_response(request)
-        self.process_response(request, response)
-        return response

diff --git a/res/res/settings.py b/res/res/settings.py
index d5e487d..2e4543c 100644 (file)
--- a/res/res/settings.py
+++ b/res/res/settings.py
@@ -17,12 +17,11 @@ import sys
 import platform
 
 import res.pub.redisco
+import yaml
 
 from res.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
 from res.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__)))
@@ -62,7 +61,6 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'res.middleware.LogContextMiddleware'
 ]
 
 ROOT_URLCONF = 'res.urls'
@@ -156,8 +154,15 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
     }
 else:
     LOGGING_CONFIG = None
+
+    log_path = '/var/log/onap/vfc/gvnfm-vnfres'
+    if not os.path.exists(log_path):
+        os.makedirs(log_path)
+
     LOGGING_FILE = os.path.join(BASE_DIR, 'res/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: