Fix PurgeLogDirTask vulnerabilities

Change-Id: Ib74fba2d09aa7066f00ddc935680c35bad0b1e74
Signed-off-by: Ronan Keogh <ronan.keogh@ericsson.com>
Issue-ID: DMAAP-775

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 7b0e0e6..14d1519 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
@@ -27,24 +27,30 @@ package org.onap.dmaap.datarouter.provisioning.utils;
 import java.io.File;\r
 import java.util.Properties;\r
 import java.util.TimerTask;\r
+import org.apache.log4j.Logger;\r
 \r
 /**\r
- * This class provides a {@link TimerTask} that purges old logfiles\r
- * (older than the number of days specified by the org.onap.dmaap.datarouter.provserver.logretention property).\r
+ * This class provides a {@link TimerTask} that purges old logfiles (older than the number of days specified by the\r
+ * org.onap.dmaap.datarouter.provserver.logretention property).\r
  *\r
  * @author Robert Eby\r
  * @version $Id: PurgeLogDirTask.java,v 1.2 2013/07/05 13:48:05 eby Exp $\r
  */\r
 public class PurgeLogDirTask extends TimerTask {\r
+\r
     private static final long ONEDAY = 86400000L;\r
 \r
     private final String logdir;\r
     private final long interval;\r
+    private Logger utilsLogger;\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
+\r
+        this.utilsLogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.utils");\r
+\r
         long n = 30;\r
         try {\r
             n = Long.parseLong(s);\r
@@ -61,12 +67,13 @@ public class PurgeLogDirTask extends TimerTask {
             if (dir.exists()) {\r
                 long exptime = System.currentTimeMillis() - interval;\r
                 for (File logfile : dir.listFiles()) {\r
-                    if (logfile.lastModified() < exptime)\r
+                    if (logfile.lastModified() < exptime) {\r
                         logfile.delete();\r
+                    }\r
                 }\r
             }\r
         } catch (Exception e) {\r
-            e.printStackTrace();\r
+            utilsLogger.error("Exception: " + e.getMessage());\r
         }\r
     }\r
 }\r