summaryrefslogtreecommitdiffstats
path: root/fcaps
diff options
context:
space:
mode:
Diffstat (limited to 'fcaps')
-rw-r--r--fcaps/fcaps/middleware.py64
-rw-r--r--fcaps/fcaps/pub/config/log.yml9
-rw-r--r--fcaps/fcaps/settings.py53
-rw-r--r--fcaps/requirements.txt3
4 files changed, 46 insertions, 83 deletions
diff --git a/fcaps/fcaps/middleware.py b/fcaps/fcaps/middleware.py
deleted file mode 100644
index e6804f08..00000000
--- a/fcaps/fcaps/middleware.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2017-2019 Wind River Systems, 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import uuid
-from django.conf import settings
-from onaplogging.mdcContext import MDC
-
-FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
- "HTTP_X_FORWARDED_SERVER"]
-
-
-class LogContextMiddleware(object):
-
- # the last IP behind multiple proxies, if no exist proxies
- # get local host ip.
- 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 propageted Id from other component. if do not fetch id,
- # generate one.
- ReqeustID = request.META.get("HTTP_X_TRANSACTIONID", None)
- if ReqeustID is None:
- ReqeustID = str(uuid.uuid3(uuid.NAMESPACE_URL, settings.MULTIVIM_VERSION))
- MDC.put("requestID", ReqeustID)
- # generate the reqeust id
- InvocationID = str(uuid.uuid4())
- MDC.put("invocationID", InvocationID)
- MDC.put("serviceName", settings.MULTIVIM_VERSION)
- MDC.put("serviceIP", self._getLastIp(request))
- return None
-
- def process_response(self, request, response):
-
- MDC.clear()
- return response
diff --git a/fcaps/fcaps/pub/config/log.yml b/fcaps/fcaps/pub/config/log.yml
index ad27b50f..71ebe2bc 100644
--- a/fcaps/fcaps/pub/config/log.yml
+++ b/fcaps/fcaps/pub/config/log.yml
@@ -23,16 +23,9 @@ handlers:
level: "DEBUG"
class: "logging.handlers.RotatingFileHandler"
filename: "/var/log/onap/multicloud/openstack/fcaps/fcaps.log"
- formatter: "mdcFormat"
+ formatter: "standard"
maxBytes: 52428800
backupCount: 10
formatters:
standard:
format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(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/fcaps/fcaps/settings.py b/fcaps/fcaps/settings.py
index 979c1519..37021e05 100644
--- a/fcaps/fcaps/settings.py
+++ b/fcaps/fcaps/settings.py
@@ -14,10 +14,9 @@
import os
import sys
-
-from logging import config
-from onaplogging import monkey
-monkey.patch_all()
+import platform
+import yaml
+from logging import config as log_config
CACHE_EXPIRATION_TIME = 3600
@@ -56,7 +55,6 @@ MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'fcaps.middleware.LogContextMiddleware',
]
ROOT_URLCONF = 'fcaps.urls'
@@ -124,10 +122,47 @@ OPENSTACK_VERSION = "fcaps"
MULTIVIM_VERSION = "multicloud-" + OPENSTACK_VERSION
-LOGGING_CONFIG = None
-# yaml configuration of logging
-LOGGING_FILE = os.path.join(BASE_DIR, 'fcaps/pub/config/log.yml')
-config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
+if platform.system() == 'Windows' or 'test' in sys.argv:
+ LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': True,
+ 'formatters': {
+ 'standard': {
+ 'format': '%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s',
+ },
+ },
+ 'filters': {
+ },
+ 'handlers': {
+ 'file_handler': {
+ 'level': 'DEBUG',
+ 'class': 'logging.handlers.RotatingFileHandler',
+ 'filename': os.path.join(BASE_DIR, 'logs/test.log'),
+ 'formatter': 'standard',
+ 'maxBytes': 1024 * 1024 * 50,
+ 'backupCount': 5,
+ },
+ },
+
+ 'loggers': {
+ 'common': {
+ 'handlers': ['file_handler'],
+ 'level': 'DEBUG',
+ 'propagate': False
+ },
+ }
+ }
+else:
+ log_path = "/var/log/onap/multicloud/openstack/fcaps"
+ if not os.path.exists(log_path):
+ os.makedirs(log_path)
+
+ LOGGING_CONFIG = None
+ # yaml configuration of logging
+ LOGGING_FILE = os.path.join(BASE_DIR, 'fcaps/pub/config/log.yml')
+ 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:
diff --git a/fcaps/requirements.txt b/fcaps/requirements.txt
index 98db366b..9db93b23 100644
--- a/fcaps/requirements.txt
+++ b/fcaps/requirements.txt
@@ -19,8 +19,7 @@ python-memcached
# mock==2.0.0
# unittest_xml_reporting==1.12.0
-# for onap logging
-onappylog>=1.0.9
+PyYAML==5.3.1
# for background tasks
celery >= 4.0