update DR logging to log under one system

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
index 502dbbd..506821e 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Feed.java
@@ -24,18 +24,16 @@
 \r
 package org.onap.dmaap.datarouter.provisioning.beans;\r
 \r
-import org.apache.log4j.Level;\r
-import org.apache.log4j.Logger;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import org.json.JSONArray;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.onap.dmaap.datarouter.provisioning.utils.DB;\r
 import org.onap.dmaap.datarouter.provisioning.utils.JSONUtilities;\r
-import org.onap.dmaap.datarouter.provisioning.utils.PasswordProcessor;\r
 import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;\r
 \r
 import java.io.InvalidObjectException;\r
-import java.security.GeneralSecurityException;\r
 import java.sql.*;\r
 import java.util.Date;\r
 import java.util.*;\r
@@ -47,7 +45,7 @@ import java.util.*;
  * @version $Id: Feed.java,v 1.13 2013/10/28 18:06:52 eby Exp $\r
  */\r
 public class Feed extends Syncable {\r
-    private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
+    private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");\r
     private static int next_feedid = getMaxFeedID() + 1;\r
 \r
     private int feedid;\r
@@ -87,7 +85,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.log(Level.WARN, "PROV0024 Feed.isFeedValid: ", e);\r
+            intlogger.warn("PROV0024 Feed.isFeedValid: ", e.getMessage());\r
         }\r
         return count != 0;\r
     }\r
@@ -137,8 +135,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.info("PROV0025 Feed.countActiveFeeds: " + e.getMessage());\r
-            intlogger.log(Level.WARN, "PROV0025 Feed.countActiveFeeds: ", e);\r
+            intlogger.warn("PROV0025 Feed.countActiveFeeds: ", e.getMessage());\r
         }\r
         return count;\r
     }\r
@@ -158,8 +155,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.info("PROV0026 Feed.getMaxFeedID: "+e.getMessage());\r
-            intlogger.log(Level.WARN, "PROV0026 Feed.getMaxFeedID: ", e);\r
+            intlogger.warn("PROV0026 Feed.getMaxFeedID: ", e.getMessage());\r
         }\r
         return max;\r
     }\r
@@ -205,7 +201,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.log(Level.WARN, "PROV0027 Feed.getAllFeeds: ", e);\r
+            intlogger.warn("PROV0027 Feed.getAllFeeds: ", e.getMessage());\r
         }\r
         return map.values();\r
     }\r
@@ -239,7 +235,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.log(Level.WARN, "PROV0028 Feed.getFilteredFeedUrlList: ", e);\r
+            intlogger.warn("PROV0028 Feed.getFilteredFeedUrlList: ", e.getMessage());\r
         }\r
         return list;\r
     }\r
@@ -276,7 +272,7 @@ public class Feed extends Syncable {
             }\r
             db.release(conn);\r
         } catch (SQLException e) {\r
-            intlogger.log(Level.WARN, "PROV0029 Feed.getFeedBySQL: ", e);\r
+            intlogger.warn("PROV0029 Feed.getFeedBySQL: ", e.getMessage());\r
         }\r
         return feed;\r
     }\r
@@ -383,7 +379,7 @@ public class Feed extends Syncable {
             JSONObject jol = jo.optJSONObject("links");\r
             this.links = (jol == null) ? (new FeedLinks()) : (new FeedLinks(jol));\r
         } catch (InvalidObjectException e) {\r
-            intlogger.log(Level.WARN, "PROV0030 Feed.Feed: ", e);\r
+            intlogger.warn("PROV0030 Feed.Feed: ", e.getMessage());\r
             throw e;\r
         } catch (Exception e) {\r
             intlogger.error("PROV0031 Feed.Feed: invalid JSON: "+e);\r