summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYun Huang <yun.huang@windriver.com>2018-05-04 14:23:37 +0800
committerYun Huang <yun.huang@windriver.com>2018-05-04 14:23:37 +0800
commitc3eaf68ffe300fddc6829808439a0874e4b6223f (patch)
tree4e15d3885cda4ea3f7d513147c699e0ae1f1ede9
parent4ec4feae42ec0a63ba655fd83daa662af9ac883a (diff)
Add logging AOP middleware for ocata
Change-Id: I62d7397306805425559f0b2bb4829518d0ccf276 Issue-ID: MULTICLOUD-220 Signed-off-by: Yun Huang <yun.huang@windriver.com>
-rw-r--r--ocata/ocata/middleware.py65
-rw-r--r--ocata/ocata/settings.py1
-rw-r--r--ocata/requirements.txt2
3 files changed, 67 insertions, 1 deletions
diff --git a/ocata/ocata/middleware.py b/ocata/ocata/middleware.py
new file mode 100644
index 00000000..f2618e06
--- /dev/null
+++ b/ocata/ocata/middleware.py
@@ -0,0 +1,65 @@
+# Copyright (c) 2017-2018 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/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 5b1780a1..9a205ab5 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -55,6 +55,7 @@ MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'ocata.middleware.LogContextMiddleware',
]
ROOT_URLCONF = 'ocata.urls'
diff --git a/ocata/requirements.txt b/ocata/requirements.txt
index 34ceaecc..5408c53b 100644
--- a/ocata/requirements.txt
+++ b/ocata/requirements.txt
@@ -20,4 +20,4 @@ mock==2.0.0
unittest_xml_reporting==1.12.0
# for onap logging
-onappylog>=1.0.5
+onappylog>=1.0.6