update DR logging to log under one system

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java
index a9b22ec..4dd422a 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/RouteServlet.java
@@ -138,16 +138,12 @@ public class RouteServlet extends ProxyServlet {
         if (!isAuthorizedForInternal(req)) {\r
             elr.setMessage("Unauthorized.");\r
             elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-            eventlogger.info(elr);\r
+            eventlogger.error(elr.toString());\r
             sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);\r
             return;\r
         }\r
         if (isProxyOK(req) && isProxyServer()) {\r
-            try {\r
-                super.doDelete(req, resp);\r
-            } catch (IOException ioe) {\r
-                eventlogger.error("IOException" + ioe.getMessage());\r
-            }\r
+            super.doDelete(req, resp);\r
             return;\r
         }\r
 \r
@@ -230,14 +226,14 @@ public class RouteServlet extends ProxyServlet {
         }\r
         if (rv) {\r
             elr.setResult(HttpServletResponse.SC_OK);\r
-            eventlogger.info(elr);\r
+            eventlogger.info(elr.toString());\r
             resp.setStatus(HttpServletResponse.SC_OK);\r
             provisioningDataChanged();\r
             provisioningParametersChanged();\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, eventlogger);\r
         }\r
     }\r
@@ -250,16 +246,12 @@ public class RouteServlet extends ProxyServlet {
         if (!isAuthorizedForInternal(req)) {\r
             elr.setMessage("Unauthorized.");\r
             elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-            eventlogger.info(elr);\r
+            eventlogger.error(elr.toString());\r
             sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);\r
             return;\r
         }\r
         if (isProxyOK(req) && isProxyServer()) {\r
-            try {\r
-                super.doGet(req, resp);\r
-            } catch (IOException ioe) {\r
-                eventlogger.error("IOException" + ioe.getMessage());\r
-            }\r
+            super.doGet(req, resp);\r
             return;\r
         }\r
 \r
@@ -335,7 +327,7 @@ public class RouteServlet extends ProxyServlet {
         if (!isAuthorizedForInternal(req)) {\r
             elr.setMessage("Unauthorized.");\r
             elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-            eventlogger.info(elr);\r
+            eventlogger.error(elr.toString());\r
             sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);\r
             return;\r
         }\r
@@ -350,16 +342,12 @@ public class RouteServlet extends ProxyServlet {
         if (!isAuthorizedForInternal(req)) {\r
             elr.setMessage("Unauthorized.");\r
             elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-            eventlogger.info(elr);\r
+            eventlogger.error(elr.toString());\r
             sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, "Unauthorized.", eventlogger);\r
             return;\r
         }\r
         if (isProxyOK(req) && isProxyServer()) {\r
-            try {\r
-                super.doPost(req, resp);\r
-            } catch (IOException ioe) {\r
-                intlogger.error("IOException" + ioe.getMessage());\r
-            }\r
+            super.doPost(req, resp);\r
             return;\r
         }\r
         String path = req.getPathInfo();\r
@@ -380,7 +368,7 @@ public class RouteServlet extends ProxyServlet {
                 int seq = (t != null) ? Integer.parseInt(t) : (IngressRoute.getMaxSequence() + 100);\r
                 ins = new Insertable[] { new IngressRoute(seq, feedid, user, subnet, NodeClass.lookupNodeNames(nodepatt)) };\r
             } catch (Exception e) {\r
-                intlogger.info(e);\r
+                intlogger.info(e.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add ingress' command.", intlogger);\r
                 return;\r
             }\r
@@ -396,7 +384,7 @@ public class RouteServlet extends ProxyServlet {
                 String node = NodeClass.normalizeNodename(req.getParameter("node"));\r
                 ins = new Insertable[] { new EgressRoute(subid, node) };\r
             } catch (Exception e) {\r
-                intlogger.info(e);\r
+                intlogger.info(e.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add egress' command.", intlogger);\r
                 return;\r
             }\r
@@ -422,7 +410,7 @@ public class RouteServlet extends ProxyServlet {
                 }\r
                 ins = new Insertable[] { nr };\r
             } catch (IllegalArgumentException e) {\r
-                intlogger.info(e);\r
+                intlogger.info(e.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Invalid arguments in 'add network' command.", intlogger);\r
                 return;\r
             }\r
@@ -437,14 +425,14 @@ public class RouteServlet extends ProxyServlet {
         }\r
         if (rv) {\r
             elr.setResult(HttpServletResponse.SC_OK);\r
-            eventlogger.info(elr);\r
+            eventlogger.info(elr.toString());\r
             resp.setStatus(HttpServletResponse.SC_OK);\r
             provisioningDataChanged();\r
             provisioningParametersChanged();\r
         } else {\r
             // Something went wrong with the INSERT\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
     }\r