update DR logging to log under one system

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java
index 4e727f1..56b40e0 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java
@@ -159,7 +159,7 @@ public class InternalServlet extends ProxyServlet {
     private static final Object lock = new Object();
     private static Integer logseq = 0; // another piece of info to make log spool file names unique
     //Adding EELF Logger Rally:US664892
-    private static EELFLogger eelflogger = EELFManager.getInstance()
+    private static EELFLogger eelfLogger = EELFManager.getInstance()
         .getLogger(InternalServlet.class);
 
     /**
@@ -169,14 +169,14 @@ public class InternalServlet extends ProxyServlet {
     @Override
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             EventLogRecord elr = new EventLogRecord(req);
             if (!isAuthorizedForInternal(req)) {
                 elr.setMessage("Unauthorized.");
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);
-                eventlogger.info(elr);
+                eventlogger.error(elr.toString());
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);
                 return;
             }
@@ -193,14 +193,14 @@ public class InternalServlet extends ProxyServlet {
                     if (param != null) {
                         if (doDelete(param)) {
                             elr.setResult(HttpServletResponse.SC_OK);
-                            eventlogger.info(elr);
+                            eventlogger.info(elr.toString());
                             resp.setStatus(HttpServletResponse.SC_OK);
                             provisioningDataChanged();
                             provisioningParametersChanged();
                         } else {
                             // Something went wrong with the DELETE
                             elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-                            eventlogger.info(elr);
+                            eventlogger.error(elr.toString());
                             sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
                         }
                         return;
@@ -209,7 +209,7 @@ public class InternalServlet extends ProxyServlet {
             }
             sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
@@ -220,9 +220,9 @@ public class InternalServlet extends ProxyServlet {
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doGet",req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             String path = req.getPathInfo();
             Properties props = (new DB()).getProperties();
             if (path.equals("/halt") && !req.isSecure()) {
@@ -243,7 +243,7 @@ public class InternalServlet extends ProxyServlet {
             if (!isAuthorizedForInternal(req)) {
                 elr.setMessage("Unauthorized.");
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);
-                eventlogger.info(elr);
+                eventlogger.error(elr.toString());
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);
                 return;
             }
@@ -336,7 +336,7 @@ public class InternalServlet extends ProxyServlet {
             }
             sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
@@ -347,14 +347,14 @@ public class InternalServlet extends ProxyServlet {
     @Override
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");
             EventLogRecord elr = new EventLogRecord(req);
             if (!isAuthorizedForInternal(req)) {
                 elr.setMessage("Unauthorized.");
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);
-                eventlogger.info(elr);
+                eventlogger.error(elr.toString());
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);
                 return;
             }
@@ -372,14 +372,14 @@ public class InternalServlet extends ProxyServlet {
                         param.setValue(t);
                         if (doUpdate(param)) {
                             elr.setResult(HttpServletResponse.SC_OK);
-                            eventlogger.info(elr);
+                            eventlogger.info(elr.toString());
                             resp.setStatus(HttpServletResponse.SC_OK);
                             provisioningDataChanged();
                             provisioningParametersChanged();
                         } else {
                             // Something went wrong with the UPDATE
                             elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-                            eventlogger.info(elr);
+                            eventlogger.error(elr.toString());
                             sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
                         }
                         return;
@@ -388,7 +388,7 @@ public class InternalServlet extends ProxyServlet {
             }
             sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger);
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }
 
@@ -400,14 +400,14 @@ public class InternalServlet extends ProxyServlet {
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);
-        eelflogger.info(EelfMsgs.ENTRY);
+        eelfLogger.info(EelfMsgs.ENTRY);
         try {
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));
             EventLogRecord elr = new EventLogRecord(req);
             if (!isAuthorizedForInternal(req)) {
                 elr.setMessage("Unauthorized.");
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);
-                eventlogger.info(elr);
+                eventlogger.error(elr.toString());
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);
                 return;
             }
@@ -426,14 +426,14 @@ public class InternalServlet extends ProxyServlet {
                         param = new Parameters(key, t);
                         if (doInsert(param)) {
                             elr.setResult(HttpServletResponse.SC_OK);
-                            eventlogger.info(elr);
+                            eventlogger.info(elr.toString());
                             resp.setStatus(HttpServletResponse.SC_OK);
                             provisioningDataChanged();
                             provisioningParametersChanged();
                         } else {
                             // Something went wrong with the INSERT
                             elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-                            eventlogger.info(elr);
+                            eventlogger.error(elr.toString());
                             sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
                         }
                         return;
@@ -447,7 +447,7 @@ public class InternalServlet extends ProxyServlet {
                     elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
                     elr.setMessage("Bad media type: " + ctype);
                     resp.setStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-                    eventlogger.info(elr);
+                    eventlogger.error(elr.toString());
                     return;
                 }
                 String spooldir = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");
@@ -464,7 +464,7 @@ public class InternalServlet extends ProxyServlet {
                     } else {
                         elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
                         resp.setStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-                        eventlogger.info(elr);
+                        eventlogger.error(elr.toString());
                         return;
                     }
                 }
@@ -487,7 +487,7 @@ public class InternalServlet extends ProxyServlet {
                 if (((avail * 100) / total) < 5) {
                     elr.setResult(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
                     resp.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-                    eventlogger.info(elr);
+                    eventlogger.error(elr.toString());
                     return;
                 }
                 Path tmppath = Paths.get(spooldir, spoolname);
@@ -497,7 +497,7 @@ public class InternalServlet extends ProxyServlet {
                     Files.move(tmppath, donepath, StandardCopyOption.REPLACE_EXISTING);
                     elr.setResult(HttpServletResponse.SC_CREATED);
                     resp.setStatus(HttpServletResponse.SC_CREATED);
-                    eventlogger.info(elr);
+                    eventlogger.info(elr.toString());
                     LogfileLoader.getLoader();    // This starts the logfile loader "task"
                 } catch (IOException ioe) {
                     intlogger.error("IOException" + ioe.getMessage());
@@ -512,7 +512,7 @@ public class InternalServlet extends ProxyServlet {
                     elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
                     elr.setMessage("Bad media type: " + ctype);
                     resp.setStatus(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
-                    eventlogger.info(elr);
+                    eventlogger.error(elr.toString());
                     return;
                 }
                 try {
@@ -527,7 +527,7 @@ public class InternalServlet extends ProxyServlet {
                     resp.setStatus(HttpServletResponse.SC_OK);
                     resp.setContentType("text/plain");
                     LogRecord.printLogRecords(resp.getOutputStream(), bs);
-                    eventlogger.info(elr);
+                    eventlogger.info(elr.toString());
                 } catch (IOException ioe) {
                     intlogger.error("IOException" + ioe.getMessage());
                 }
@@ -536,9 +536,9 @@ public class InternalServlet extends ProxyServlet {
 
             elr.setResult(HttpServletResponse.SC_NOT_FOUND);
             sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, "Bad URL.", eventlogger);
-            eventlogger.info(elr);
+            eventlogger.error(elr.toString());
         } finally {
-            eelflogger.info(EelfMsgs.EXIT);
+            eelfLogger.info(EelfMsgs.EXIT);
         }
     }