Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove critical code smells for utils classes
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
utils
/
LogfileLoader.java
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
af9f829
..
3ba1a15
100644
(file)
--- 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;
\r
import java.util.zip.GZIPInputStream;
\r
\r
import java.util.TreeSet;
\r
import java.util.zip.GZIPInputStream;
\r
\r
-import org.apache.log4j.Logger;
\r
+import com.att.eelf.configuration.EELFLogger;
\r
+import com.att.eelf.configuration.EELFManager;
\r
import org.onap.dmaap.datarouter.provisioning.BaseServlet;
\r
import org.onap.dmaap.datarouter.provisioning.beans.DeliveryExtraRecord;
\r
import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;
\r
import org.onap.dmaap.datarouter.provisioning.BaseServlet;
\r
import org.onap.dmaap.datarouter.provisioning.beans.DeliveryExtraRecord;
\r
import org.onap.dmaap.datarouter.provisioning.beans.DeliveryRecord;
\r
@@
-82,7
+83,7
@@
public class LogfileLoader extends Thread {
/**
\r
* This is a singleton -- there is only one LogfileLoader object in the server
\r
*/
\r
/**
\r
* This is a singleton -- there is only one LogfileLoader object in the server
\r
*/
\r
- private static LogfileLoader
p
;
\r
+ private static LogfileLoader
logfileLoader
;
\r
\r
/**
\r
* Get the singleton LogfileLoader object, and start it if it is not running.
\r
\r
/**
\r
* Get the singleton LogfileLoader object, and start it if it is not running.
\r
@@
-90,11
+91,11
@@
public class LogfileLoader extends Thread {
* @return the LogfileLoader
\r
*/
\r
public static synchronized LogfileLoader getLoader() {
\r
* @return the LogfileLoader
\r
*/
\r
public static synchronized LogfileLoader getLoader() {
\r
- if (
p
== null)
\r
-
p
= new LogfileLoader();
\r
- if (!
p
.isAlive())
\r
-
p
.start();
\r
- return
p
;
\r
+ if (
logfileLoader
== null)
\r
+
logfileLoader
= new LogfileLoader();
\r
+ if (!
logfileLoader
.isAlive())
\r
+
logfileLoader
.start();
\r
+ return
logfileLoader
;
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-106,7
+107,7
@@
public class LogfileLoader extends Thread {
*/
\r
private static final long SET_SIZE = (1L << 56);
\r
\r
*/
\r
private static final long SET_SIZE = (1L << 56);
\r
\r
- private final Logger logger;
\r
+ private final
EELF
Logger logger;
\r
private final DB db;
\r
private final String spooldir;
\r
private final long set_start;
\r
private final DB db;
\r
private final String spooldir;
\r
private final long set_start;
\r
@@
-116,7
+117,7
@@
public class LogfileLoader extends Thread {
private boolean idle;
\r
\r
private LogfileLoader() {
\r
private boolean idle;
\r
\r
private LogfileLoader() {
\r
- this.logger =
Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal
");
\r
+ this.logger =
EELFManager.getInstance().getLogger("InternalLog
");
\r
this.db = new DB();
\r
this.spooldir = db.getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");
\r
this.set_start = getIdRange();
\r
this.db = new DB();
\r
this.spooldir = db.getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");
\r
this.set_start = getIdRange();
\r
@@
-274,7
+275,7
@@
public class LogfileLoader extends Thread {
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
- logger.error(e);
\r
+ logger.error(e
.toString()
);
\r
} finally {
\r
db.release(conn);
\r
}
\r
} finally {
\r
db.release(conn);
\r
}
\r
@@
-296,7
+297,7
@@
public class LogfileLoader extends Thread {
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
- logger.error(e);
\r
+ logger.error(e
.toString()
);
\r
} finally {
\r
db.release(conn);
\r
}
\r
} finally {
\r
db.release(conn);
\r
}
\r
@@
-321,7
+322,7
@@
public class LogfileLoader extends Thread {
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
}
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
- logger.error(e);
\r
+ logger.error(e
.toString()
);
\r
} finally {
\r
db.release(conn);
\r
}
\r
} finally {
\r
db.release(conn);
\r
}
\r
@@
-375,7
+376,7
@@
public class LogfileLoader extends Thread {
logger.debug(String.format("initializeNextid, next ID is %d (%x)", nextid, nextid));
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
logger.debug(String.format("initializeNextid, next ID is %d (%x)", nextid, nextid));
\r
} catch (SQLException e) {
\r
System.err.println(e);
\r
- logger.error(e);
\r
+ logger.error(e
.toString()
);
\r
} finally {
\r
db.release(conn);
\r
}
\r
} finally {
\r
db.release(conn);
\r
}
\r
@@
-415,16
+416,16
@@
public class LogfileLoader extends Thread {
}
\r
} catch (SQLException e) {
\r
logger.warn("PROV8003 Invalid value in record: " + line);
\r
}
\r
} catch (SQLException e) {
\r
logger.warn("PROV8003 Invalid value in record: " + line);
\r
- logger.debug(e);
\r
+ logger.debug(e
.toString(), e
);
\r
} catch (NumberFormatException e) {
\r
logger.warn("PROV8004 Invalid number in record: " + line);
\r
} catch (NumberFormatException e) {
\r
logger.warn("PROV8004 Invalid number in record: " + line);
\r
- logger.debug(e);
\r
+ logger.debug(e
.toString()
);
\r
} catch (ParseException e) {
\r
logger.warn("PROV8005 Invalid date in record: " + line);
\r
} catch (ParseException e) {
\r
logger.warn("PROV8005 Invalid date in record: " + line);
\r
- logger.debug(e);
\r
+ logger.debug(e
.toString()
);
\r
} catch (Exception e) {
\r
logger.warn("PROV8006 Invalid pattern in record: " + line);
\r
} catch (Exception e) {
\r
logger.warn("PROV8006 Invalid pattern in record: " + line);
\r
- logger.debug(e);
\r
+ logger.debug(e
.toString(), e
);
\r
}
\r
total++;
\r
}
\r
}
\r
total++;
\r
}
\r