Refactor Prov DB handling

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
index 7cb1c02..c4994bb 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
@@ -32,6 +32,7 @@ import java.nio.file.Files;
 import java.util.Objects;\r
 import java.util.Properties;\r
 import java.util.TimerTask;\r
+import org.onap.dmaap.datarouter.provisioning.ProvRunner;\r
 \r
 /**\r
  * This class provides a {@link TimerTask} that purges old logfiles (older than the number of days specified by the\r
@@ -48,18 +49,21 @@ public class PurgeLogDirTask extends TimerTask {
     private final long interval;\r
     private EELFLogger utilsLogger;\r
 \r
+    /**\r
+     * PurgeLogDirTask constructor.\r
+     */\r
     public PurgeLogDirTask() {\r
-        Properties p = (new DB()).getProperties();\r
-        logdir = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
-        String s = p.getProperty("org.onap.dmaap.datarouter.provserver.logretention", "30");\r
+        Properties prop = ProvRunner.getProvProperties();\r
+        logdir = prop.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
+        String str = prop.getProperty("org.onap.dmaap.datarouter.provserver.logretention", "30");\r
         this.utilsLogger = EELFManager.getInstance().getLogger("UtilsLog");\r
-        long n = 30;\r
+        long retention = 30;\r
         try {\r
-            n = Long.parseLong(s);\r
+            retention = Long.parseLong(str);\r
         } catch (NumberFormatException e) {\r
             // ignore\r
         }\r
-        interval = n * ONEDAY;\r
+        interval = retention * ONEDAY;\r
     }\r
 \r
     @Override\r