Some more logging

Author: GenieTim

src/main/java/edu/harvard/mcz/imagecapture/jobs/AbstractFileScanJob.java

@@ -54,7 +54,7 @@ static void logMismatch(ScanCounterInterface counter, String filename,
                         .getProperty(ImageCaptureProperties.KEY_REDUNDANT_COMMENT_BARCODE)
                         .equals("true")) {
             // If so configured, or if image metadata contains a barcode that doesn't
-            // match the barcode in the image report on barcode/comment missmatch as
+            // match the barcode in the image report on barcode/comment mismatch as
             // an error condition.
             try {
                 RunnableJobError error = new RunnableJobError(
@@ -71,8 +71,7 @@ static void logMismatch(ScanCounterInterface counter, String filename,
             // This would normally the case where the image metadata doesn't contain a
             // barcode but the image does, and reporting of this state as an error has
             // been turned off.
-            log.debug("Barcode/Comment mismatch: [" + barcode + "]!=[" + exifComment +
-                    "]");
+            log.debug("Barcode/Comment mismatch: [{}]!=[{}]", barcode, exifComment);
         }
     }
 
@@ -387,7 +386,14 @@ protected static void checkFile(File containedFile,
                                 null, null, null, RunnableJobError.TYPE_MISMATCH);
                     }
                     counter.appendError(error);
-                    counter.incrementFilesFailed();
+                    // If this is an existing file we're trying to update (reattach=true),
+                    // count it as existing, not as a new failure
+                    if (reattach) {
+                        counter.incrementFilesExisting();
+                        log.debug("Existing image record for file {} still has problems, counted as existing", containedFile.getName());
+                    } else {
+                        counter.incrementFilesFailed();
+                    }
                     return;
                 }
             }

src/main/java/edu/harvard/mcz/imagecapture/jobs/JobAllImageFilesScan.java

@@ -251,8 +251,10 @@ public void start() {
             // walk through directory tree
             Singleton.getSingletonInstance().getMainFrame().setStatusMessage(
                     "Scanning path: " + startPoint.getPath());
-                Counter counter = new Counter();
-                AtomicCounter workerCounter = new AtomicCounter();
+            log.info("Starting preprocess scan of image files in: " +
+                    startPoint.getPath());
+            Counter counter = new Counter();
+            AtomicCounter workerCounter = new AtomicCounter();
             // count files to scan
             countFiles(startPoint, counter);
             setPercentComplete(0);
@@ -264,7 +266,7 @@ public void start() {
                 // Create executor service once for entire scan to prevent premature
                 // shutdown during recursive directory traversal (fixes issue where only
                 // a few files were processed when scanning many files)
-                
+
                 // Clean up any existing executor service from previous runs
                 if (executorService != null && !executorService.isTerminated()) {
                     log.warn("Executor service from previous run still exists, shutting it down");
@@ -276,7 +278,7 @@ public void start() {
                         Thread.currentThread().interrupt();
                     }
                 }
-                
+
                 int concurrencyLevel = Integer.parseInt(
                         Singleton.getSingletonInstance()
                                 .getProperties()
@@ -287,12 +289,12 @@ public void start() {
                 for (int i = 0; i < locks.length; ++i) {
                     locks[i] = new ReentrantLock();
                 }
-                
+
                 log.info("Starting file scan with " + concurrencyLevel + " threads, total files to process: " + counter.getTotal());
                 checkFiles(startPoint, counter, workerCounter);
-                
+
                 // Shutdown executor and wait for all tasks to complete
-                log.info("File scanning completed, shutting down executor and waiting for " + 
+                log.info("File scanning completed, shutting down executor and waiting for " +
                         workerCounter.getFilesSeen() + " processing tasks to finish");
                 executorService.shutdown();
                 try {
@@ -302,7 +304,7 @@ public void start() {
                     long startWait = System.currentTimeMillis();
                     if (!executorService.awaitTermination(12, TimeUnit.HOURS)) {
                         long waitedMinutes = (System.currentTimeMillis() - startWait) / 60000;
-                        log.warn("Execution pool did not terminate within 12 hours (waited " + 
+                        log.warn("Execution pool did not terminate within 12 hours (waited " +
                                 waitedMinutes + " minutes), forcing shutdown. " +
                                 "Files processed: " + workerCounter.getFilesSeen() + " of " + counter.getTotal());
                         executorService.shutdownNow();
@@ -314,7 +316,7 @@ public void start() {
                         log.info("All processing tasks completed successfully after " + waitedSeconds + " seconds");
                     }
                 } catch (InterruptedException e) {
-                    log.error("Execution pool interrupted during termination, processed " + 
+                    log.error("Execution pool interrupted during termination, processed " +
                             workerCounter.getFilesSeen() + " of " + counter.getTotal() + " files", e);
                     executorService.shutdownNow();
                     Thread.currentThread().interrupt();