Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
update DR logging to log under one system
[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / SubscriptionServlet.java
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
index d7c4657..63ff84d 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
@@ -60,7 +60,7 @@ public class SubscriptionServlet extends ProxyServlet {
 \r
     private static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.dmaap-dr.subscription-control";\r
     //Adding EELF Logger Rally:US664892\r
-    private static EELFLogger eelflogger = EELFManager.getInstance()\r
+    private static EELFLogger eelfLogger = EELFManager.getInstance()\r
         .getLogger(SubscriptionServlet.class);\r
 \r
     /**\r
@@ -70,15 +70,15 @@ public class SubscriptionServlet extends ProxyServlet {
     @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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -91,7 +91,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing " + BEHALF_HEADER + " header.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -100,7 +100,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -109,7 +109,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\r
@@ -125,7 +125,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     message = "Policy Engine disallows access.";\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.error(elr.toString());\r
                     sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                     return;\r
                 }\r
@@ -136,7 +136,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     message = "AAF disallows access to permission - " + permission;\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.error(elr.toString());\r
                     sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                     return;\r
                 }\r
@@ -149,17 +149,17 @@ public class SubscriptionServlet extends ProxyServlet {
                 activeSubs--;\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_NO_CONTENT);\r
-                eventlogger.info(elr);\r
+                eventlogger.info(elr.toString());\r
                 resp.setStatus(HttpServletResponse.SC_NO_CONTENT);\r
                 provisioningDataChanged();\r
             } else {\r
                 // Something went wrong with the DELETE\r
                 elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -171,15 +171,15 @@ public class SubscriptionServlet extends ProxyServlet {
     @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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -192,7 +192,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing " + BEHALF_HEADER + " header.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -201,7 +201,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -210,7 +210,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\r
@@ -220,14 +220,14 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Policy Engine disallows access.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
 \r
             // send response\r
             elr.setResult(HttpServletResponse.SC_OK);\r
-            eventlogger.info(elr);\r
+            eventlogger.info(elr.toString());\r
             resp.setStatus(HttpServletResponse.SC_OK);\r
             resp.setContentType(SUBFULL_CONTENT_TYPE);\r
             try {\r
@@ -236,7 +236,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 eventlogger.error("IOException: " + ioe.getMessage());\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -247,15 +247,15 @@ public class SubscriptionServlet extends ProxyServlet {
     @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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -268,7 +268,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing " + BEHALF_HEADER + " header.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -277,7 +277,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -286,7 +286,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\r
@@ -297,7 +297,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Incorrect content-type";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
                 return;\r
             }\r
@@ -306,7 +306,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Badly formed JSON";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -320,7 +320,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = e.getMessage();\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -337,7 +337,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     message = "Policy Engine disallows access.";\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.error(elr.toString());\r
                     sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                     return;\r
                 }\r
@@ -348,7 +348,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     message = "AAF disallows access to permission - " + permission;\r
                     elr.setMessage(message);\r
                     elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                    eventlogger.info(elr);\r
+                    eventlogger.error(elr.toString());\r
                     sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                     return;\r
                 }\r
@@ -365,7 +365,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "This subscriber must be modified by the same subscriber that created it.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -374,7 +374,7 @@ public class SubscriptionServlet extends ProxyServlet {
             if (doUpdate(sub)) {\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_OK);\r
-                eventlogger.info(elr);\r
+                eventlogger.info(elr.toString());\r
                 resp.setStatus(HttpServletResponse.SC_OK);\r
                 resp.setContentType(SUBFULL_CONTENT_TYPE);\r
                 try {\r
@@ -401,11 +401,11 @@ public class SubscriptionServlet extends ProxyServlet {
             } else {\r
                 // Something went wrong with the UPDATE\r
                 elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -417,15 +417,15 @@ public class SubscriptionServlet extends ProxyServlet {
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
 \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
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -438,7 +438,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing " + BEHALF_HEADER + " header.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -447,7 +447,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Missing or bad subscription number.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -458,7 +458,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Incorrect content-type";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
                 return;\r
             }\r
@@ -468,7 +468,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Policy Engine disallows access.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -477,7 +477,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = "Badly formed JSON";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -493,17 +493,17 @@ public class SubscriptionServlet extends ProxyServlet {
                 }\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_ACCEPTED);\r
-                eventlogger.info(elr);\r
+                eventlogger.info(elr.toString());\r
                 resp.setStatus(HttpServletResponse.SC_ACCEPTED);\r
             } catch (JSONException e) {\r
                 message = "Badly formed JSON";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -542,7 +542,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     }\r
                 }\r
             } catch (Exception e) {\r
-                intlogger.warn("Caught exception in SubscriberNotifyThread: " + e);\r
+                intlogger.warn("Caught exception in SubscriberNotifyThread: " + e.getMessage());\r
             }\r
         }\r
     }\r
The Data Routing System project is intended to provide a common framework by which data producers can make data available to data consumers and a way for potential consumers to find feeds with the data they require. The interface to DR is exposed as a RESTful web service known as the DR Publishing and Delivery API