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=3ba1a1511dfa583e122b0464eef5d5b1afc55c42;hb=29c4f8051e4fc856cd84b97e31f445f65f7e497d;hp=af9f82954baa5e70e2988b2da5eefef22e2236da;hpb=d58e5ee2c614b67de066ebfbe586cd86236e2831;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 af9f8295..3ba1a151 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,11 +91,11 @@ 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;
     }
 
     /**
@@ -106,7 +107,7 @@ public class LogfileLoader extends Thread {
      */
     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();
@@ -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);
             }
@@ -296,7 +297,7 @@ public class LogfileLoader extends Thread {
            }
          } catch (SQLException e) {
             System.err.println(e);
-            logger.error(e);
+            logger.error(e.toString());
         } finally {
             db.release(conn);
         }
@@ -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,7 +376,7 @@ 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);
         }
@@ -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(), e);
                     } 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(), e);
                     }
                     total++;
                 }