X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FLogfileLoader.java;h=8223188434ab82437c98d303d95032c22db5273c;hb=refs%2Fchanges%2F51%2F78851%2F11;hp=b6ad8e43b54433ad733a44d619eb18cf3753558e;hpb=233898bab542c5425af9f6240955bad3904f9838;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
index b6ad8e43..82231884 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
@@ -46,7 +46,8 @@ import java.util.Map;
 import java.util.TreeSet;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.log4j.Logger;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.onap.dmaap.datarouter.provisioning.BaseServlet;
 import org.onap.dmaap.datarouter.provisioning.beans.DeliveryExtraRecord;
 import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;
@@ -82,7 +83,7 @@ public class LogfileLoader extends Thread {
     /**
      * This is a singleton -- there is only one LogfileLoader object in the server
      */
-    private static LogfileLoader p;
+    private static LogfileLoader logfileLoader;
 
     /**
      * Get the singleton LogfileLoader object, and start it if it is not running.
@@ -90,23 +91,23 @@ public class LogfileLoader extends Thread {
      * @return the LogfileLoader
      */
     public static synchronized LogfileLoader getLoader() {
-        if (p == null)
-            p = new LogfileLoader();
-        if (!p.isAlive())
-            p.start();
-        return p;
+        if (logfileLoader == null)
+            logfileLoader = new LogfileLoader();
+        if (!logfileLoader.isAlive())
+            logfileLoader.start();
+        return logfileLoader;
     }
 
     /**
      * The PreparedStatement which is loaded by a <i>Loadable</i>.
      */
-    public static final String INSERT_SQL = "insert into LOG_RECORDS values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+    public static final String INSERT_SQL = "insert into LOG_RECORDS values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     /**
      * Each server can assign this many IDs
      */
     private static final long SET_SIZE = (1L << 56);
 
-    private final Logger logger;
+    private final EELFLogger logger;
     private final DB db;
     private final String spooldir;
     private final long set_start;
@@ -116,7 +117,7 @@ public class LogfileLoader extends Thread {
     private boolean idle;
 
     private LogfileLoader() {
-        this.logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+        this.logger = EELFManager.getInstance().getLogger("InternalLog");
         this.db = new DB();
         this.spooldir = db.getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");
         this.set_start = getIdRange();
@@ -218,7 +219,7 @@ public class LogfileLoader extends Thread {
         }
     }
 
-    private boolean pruneRecords() {
+    boolean pruneRecords() {
         boolean did1 = false;
         long count = countRecords();
         long threshold = DEFAULT_LOG_RETENTION;
@@ -274,7 +275,7 @@ public class LogfileLoader extends Thread {
              }
             } catch (SQLException e) {
                 System.err.println(e);
-                logger.error(e);
+                logger.error(e.toString());
             } finally {
                 db.release(conn);
             }
@@ -282,7 +283,7 @@ public class LogfileLoader extends Thread {
         return did1;
     }
 
-    private long countRecords() {
+    long countRecords() {
         long count = 0;
         Connection conn = null;
         try {
@@ -296,14 +297,14 @@ public class LogfileLoader extends Thread {
            }
          } catch (SQLException e) {
             System.err.println(e);
-            logger.error(e);
+            logger.error(e.toString());
         } finally {
             db.release(conn);
         }
         return count;
     }
 
-    private Map<Long, Long> getHistogram() {
+    Map<Long, Long> getHistogram() {
         Map<Long, Long> map = new HashMap<Long, Long>();
         Connection conn = null;
         try {
@@ -321,7 +322,7 @@ public class LogfileLoader extends Thread {
             }
            } catch (SQLException e) {
             System.err.println(e);
-            logger.error(e);
+            logger.error(e.toString());
         } finally {
             db.release(conn);
         }
@@ -375,14 +376,14 @@ public class LogfileLoader extends Thread {
             logger.debug(String.format("initializeNextid, next ID is %d (%x)", nextid, nextid));
         } catch (SQLException e) {
             System.err.println(e);
-            logger.error(e);
+            logger.error(e.toString());
         } finally {
             db.release(conn);
         }
     }
 
     @SuppressWarnings("resource")
-    private int[] process(File f) {
+    int[] process(File f) {
         int ok = 0, total = 0;
         try {
             Connection conn = db.getConnection();
@@ -415,16 +416,16 @@ public class LogfileLoader extends Thread {
                         }
                     } catch (SQLException e) {
                         logger.warn("PROV8003 Invalid value in record: " + line);
-                        logger.debug(e);
+                        logger.debug(e.toString());
                     } catch (NumberFormatException e) {
                         logger.warn("PROV8004 Invalid number in record: " + line);
-                        logger.debug(e);
+                        logger.debug(e.toString());
                     } catch (ParseException e) {
                         logger.warn("PROV8005 Invalid date in record: " + line);
-                        logger.debug(e);
+                        logger.debug(e.toString());
                     } catch (Exception e) {
                         logger.warn("PROV8006 Invalid pattern in record: " + line);
-                        logger.debug(e);
+                        logger.debug(e.toString());
                     }
                     total++;
                 }
@@ -442,7 +443,7 @@ public class LogfileLoader extends Thread {
         return new int[]{ok, total};
     }
 
-    private Loadable[] buildRecords(String line) throws ParseException {
+    Loadable[] buildRecords(String line) throws ParseException {
         String[] pp = line.split("\\|");
         if (pp != null && pp.length >= 7) {
             String rtype = pp[1].toUpperCase();