Clean up logging system

[jabaws.git] / webservices / compbio / stat / collector / DirCleaner.java

diff --git a/webservices/compbio/stat/collector/DirCleaner.java b/webservices/compbio/stat/collector/DirCleaner.java
index d10461e..f3e2118 100644 (file)
--- a/webservices/compbio/stat/collector/DirCleaner.java
+++ b/webservices/compbio/stat/collector/DirCleaner.java
@@ -19,21 +19,13 @@ package compbio.stat.collector;
 \r
 import java.io.File;\r
 import java.io.FileFilter;\r
-import java.io.IOException;\r
-import java.sql.SQLException;\r
-import java.text.SimpleDateFormat;\r
-import java.util.ArrayList;\r
 import java.util.Date;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
 import compbio.engine.Cleaner;\r
-import compbio.engine.client.Executable;\r
 import compbio.engine.client.PathValidator;\r
-import compbio.engine.client.SkeletalExecutable;\r
-import compbio.metadata.JobStatus;\r
 import compbio.stat.collector.JobStat;\r
-import compbio.util.FileUtil;\r
 \r
 /**\r
  * Number of runs of each WS = number of folders with name\r
@@ -95,7 +87,9 @@ public class DirCleaner implements Runnable {
        }\r
 \r
        boolean livesOverLifeSpan(JobDirectory jd) {\r
-               return ((System.currentTimeMillis() - jd.jobdir.lastModified()) / (1000 * 60 * 60)) > LifeSpanInHours;\r
+               long LifeTime = (System.currentTimeMillis() - jd.jobdir.lastModified()) / (1000 * 60 * 60);\r
+               log.debug("lifetime = " + LifeTime + ", lifespan = " + LifeSpanInHours);\r
+               return LifeTime > LifeSpanInHours;\r
        }\r
 \r
        static FileFilter directories = new FileFilter() {\r
@@ -111,11 +105,18 @@ public class DirCleaner implements Runnable {
                for (File dir : dirs) {\r
                        // Do not look at dirs with unfinished jobs\r
                        JobDirectory jd = new JobDirectory(dir);\r
-                       if (hasCompleted(jd) && livesOverLifeSpan(jd)) {\r
-                               Cleaner.deleteDirectory(workDirectory.getAbsolutePath() + File.separator + dir.getName());\r
-                               log.debug("Directory " + dir.getName() + " is deleted in doCleaning");\r
+                       Date d = new Date (dir.lastModified());\r
+                       log.debug("Directory " + dir.getName() + " has timestamp: " + d);\r
+                       // TODO. removed hasCompeted. Maybe it needs to be restored...\r
+                       // if (hasCompleted(jd) && livesOverLifeSpan(jd)) {\r
+                       if (livesOverLifeSpan(jd)) {\r
+                               if (Cleaner.deleteDirectory(workDirectory.getAbsolutePath() + File.separator + dir.getName())) {\r
+                                       log.error("Directory " + dir.getName() + " failed to deleted...");\r
+                               } else {\r
+                                       log.debug("Directory " + dir.getName() + " is deleted");\r
+                               }\r
                        } else {\r
-                               log.debug("Directory " + dir.getName() + " is too new and kept in doCleaning");\r
+                               log.debug("Directory " + dir.getName() + " is too new and kept");\r
                        }\r
                }\r
        }\r