logging under one system updates

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / PublishServlet.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
index 3ae63bb..76a983f 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/PublishServlet.java
@@ -26,14 +26,15 @@ package org.onap.dmaap.datarouter.provisioning;
 \r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
+\r
 import java.io.IOException;\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-import java.util.List;\r
+import java.util.*;\r
 import javax.servlet.ServletConfig;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.apache.commons.lang3.StringUtils;\r
 import org.json.JSONArray;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
@@ -58,8 +59,8 @@ public class PublishServlet extends BaseServlet {
     private String provstring;\r
     private List<IngressRoute> irt;\r
     //Adding EELF Logger Rally:US664892\r
-    private static EELFLogger eelflogger = EELFManager.getInstance()\r
-            .getLogger("org.onap.dmaap.datarouter.provisioning.PublishServlet");\r
+    private static EELFLogger eelfLogger = EELFManager.getInstance()\r
+            .getLogger(PublishServlet.class);\r
     private static final Object lock = new Object();\r
 \r
 \r
@@ -74,33 +75,61 @@ public class PublishServlet extends BaseServlet {
 \r
     @Override\r
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doDelete");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
-        redirect(req, resp);\r
+        setUpEelfForPublishServlet(req, "doDelete");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            redirect(req, resp);\r
+        } finally {\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
+        }\r
     }\r
 \r
     @Override\r
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doGet");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+        setUpEelfForPublishServlet(req, "doGet");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
         redirect(req, resp);\r
+        } finally {\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
+        }\r
     }\r
 \r
     @Override\r
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doPut");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+        setUpEelfForPublishServlet(req, "doPut");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
         redirect(req, resp);\r
+        } finally {\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
+        }\r
     }\r
 \r
     @Override\r
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doPost");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+        setUpEelfForPublishServlet(req, "doPost");\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
         redirect(req, resp);\r
+        } finally {\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
+        }\r
 \r
     }\r
 \r
+    private void setUpEelfForPublishServlet(HttpServletRequest req, String method) {\r
+        if (StringUtils.isBlank(req.getHeader("X-ONAP-RequestID")) || StringUtils.isBlank(req.getHeader("X-InvocationID"))) {\r
+            setIpFqdnForEelf(method);\r
+        } else {\r
+            setIpFqdnRequestIDandInvocationIDForEelf(method, req);\r
+        }\r
+    }\r
+\r
     private void redirect(HttpServletRequest req, HttpServletResponse resp) {\r
         try {\r
             String[] nodes = getNodes();\r
@@ -116,7 +145,7 @@ public class PublishServlet extends BaseServlet {
                             : "Invalid request - Missing file ID.";\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.error(elr.toString());\r
 \r
                     resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);\r
                 } else {\r
@@ -133,7 +162,7 @@ public class PublishServlet extends BaseServlet {
                     String message = "Redirected to: " + newurl;\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.info(elr.toString());\r
 \r
                     resp.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);\r
                     resp.setHeader("Location", newurl);\r
@@ -141,7 +170,6 @@ public class PublishServlet extends BaseServlet {
             }\r
         } catch (IOException ioe) {\r
             intlogger.error("IOException" + ioe.getMessage());\r
-\r
         }\r
     }\r
 \r