X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FPublishServlet.java;h=76a983f8f47bfa6501726cf6dc709454bf0e5aa0;hb=0155643bfd2e38ca3a557faca9bdb282331c6590;hp=3ae63bb282d0d06a95a0c9c458bd22605fe7ff3c;hpb=6e74f6b7b372353637711d69c6940c787c0373ce;p=dmaap%2Fdatarouter.git

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