update DR logging to log under one system

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
index c58bda8..77bcbdd 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/LogServlet.java
@@ -64,7 +64,7 @@ import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.send
 @SuppressWarnings("serial")\r
 public class LogServlet extends BaseServlet {\r
     //Adding EELF Logger Rally:US664892\r
-    private static EELFLogger eelflogger = EELFManager.getInstance().getLogger(LogServlet.class);\r
+    private static EELFLogger eelfLogger = EELFManager.getInstance().getLogger(LogServlet.class);\r
     private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);\r
     private static final String FMT_1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
     private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
@@ -148,17 +148,17 @@ public class LogServlet extends BaseServlet {
     @Override\r
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             String message = "DELETE not allowed for the logURL.";\r
             EventLogRecord elr = new EventLogRecord(req);\r
             elr.setMessage(message);\r
             elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-            eventlogger.info(elr);\r
+            eventlogger.error(elr.toString());\r
             sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
         } finally {\r
-        eelflogger.info(EelfMsgs.EXIT);\r
+        eelfLogger.info(EelfMsgs.EXIT);\r
     }\r
     }\r
     /**\r
@@ -168,9 +168,9 @@ public class LogServlet extends BaseServlet {
     @Override\r
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             int id = getIdFromPath(req);\r
             if (id < 0) {\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Missing or bad feed/subscription number.", eventlogger);\r
@@ -229,7 +229,7 @@ public class LogServlet extends BaseServlet {
                 eventlogger.error("IOException: " + ioe.getMessage());\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
     /**\r
@@ -238,17 +238,17 @@ public class LogServlet extends BaseServlet {
     @Override\r
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");\r
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");\r
         String message = "PUT not allowed for the logURL.";\r
         EventLogRecord elr = new EventLogRecord(req);\r
         elr.setMessage(message);\r
         elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-        eventlogger.info(elr);\r
+        eventlogger.error(elr.toString());\r
         sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
     /**\r
@@ -257,17 +257,17 @@ public class LogServlet extends BaseServlet {
     @Override\r
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+        eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
         String message = "POST not allowed for the logURL.";\r
         EventLogRecord elr = new EventLogRecord(req);\r
         elr.setMessage(message);\r
         elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-        eventlogger.info(elr);\r
+        eventlogger.error(elr.toString());\r
         sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r