wait until the next run to remove the directory if it gets emptied

Author: tburch

src/main/java/com/lowtuna/jsonblob/core/BlobCleanupConsumer.java

@@ -28,11 +28,11 @@ public class BlobCleanupConsumer implements Runnable {
 
   @Override
   public void run() {
-    log.info("Polling queue for files to process for {}", QUEUE_TIMEOUT);
+    log.debug("Polling queue for files to process for {}", QUEUE_TIMEOUT);
     try {
       File file = filesToProcess.poll(QUEUE_TIMEOUT.getQuantity(), QUEUE_TIMEOUT.getUnit());
       if (file == null) {
-        log.info("Timed out after {} while waiting for something to come onto the queue", QUEUE_TIMEOUT);
+        log.debug("Timed out after {} while waiting for something to come onto the queue", QUEUE_TIMEOUT);
         return;
       }
       log.debug("Processing {}", file.getAbsolutePath());

src/main/java/com/lowtuna/jsonblob/core/BlobCleanupProducer.java

@@ -15,6 +15,7 @@
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Created by tburch on 8/18/17.
@@ -41,8 +42,10 @@ protected boolean handleDirectory(File directory, int depth, Collection<Void> re
       boolean process = localDate.isBefore(LocalDate.now().minusDays(blobAccessTtl.toDays()));
       if (process) {
         log.info("Processing {} blobs for un-accessed blobs", directory.getAbsolutePath());
+        AtomicInteger fileCount = new AtomicInteger(0);
         Files.newDirectoryStream(directory.toPath())
                 .forEach(path -> {
+                  fileCount.incrementAndGet();
                   File file = path.toFile();
                   if (file.getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
                     return;
@@ -53,27 +56,26 @@ protected boolean handleDirectory(File directory, int depth, Collection<Void> re
                     log.warn("Interrupted while trying to add file to be processed at {}", file.getAbsolutePath(), e);
                   }
                 });
-      }
 
-      File[] files = directory.listFiles();
-      if (files != null && files.length == 1) {
-        if (files[0].getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
-          if (directory.delete()) {
-            log.info("{} has only a metadata file, so it's being deleted", directory.getAbsolutePath());
+        if (fileCount.get() == 0) {
+          log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
+        } else if (fileCount.get() == 1) {
+          File[] files = directory.listFiles();
+          if (files != null && files[0].getName().startsWith(FileSystemJsonBlobManager.BLOB_METADATA_FILE_NAME)) {
+            if (directory.delete()) {
+              log.info("{} has only a metadata file, so it's being deleted", directory.getAbsolutePath());
+            }
           }
         }
-      } else if (files.length == 0) {
-        log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
+        return false;
       }
-      return false;
     } else {
       File[] files = directory.listFiles();
       if (files != null && files.length == 0) {
         if (directory.delete()) log.info("{} has no files, so it's being deleted", directory.getAbsolutePath());
         return false;
       }
     }
-
     return true;
   }