From 4ab9dc5be7b8346e38ee6ed80558debf8e02ccfc Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 9 May 2012 13:10:46 -0400
Subject: [PATCH] Add more info to log when ingests are cancelled.

---
 .../src/org/sleuthkit/autopsy/ingest/IngestImageThread.java   | 2 ++
 Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
index d90c532c55..9a7f1da1e3 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
@@ -65,6 +65,7 @@ public class IngestImageThread extends SwingWorker<Object,Void> {
 
             @Override
             public boolean cancel() {
+                logger.log(Level.INFO, "Image ingest service " + service.getName() + " cancelled by user.");
                 return IngestImageThread.this.cancel(true);
             }
         });
@@ -75,6 +76,7 @@ public class IngestImageThread extends SwingWorker<Object,Void> {
         controller = new IngestImageWorkerController(this, progress);
 
         if (isCancelled()) {
+            logger.log(Level.INFO, "Terminating image ingest service " + service.getName() + " due to cancellation.");
             return null;
         }
         try {
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 9d64d7313e..53201d10e8 100755
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -942,6 +942,7 @@ public class IngestManager {
 
                 @Override
                 public boolean cancel() {
+                    logger.log(Level.INFO, "Filed ingest cancelled by user.");
                     return IngestFsContentThread.this.cancel(true);
                 }
             });
@@ -965,6 +966,7 @@ public class IngestManager {
 
                 for (IngestServiceFsContent service : unit.getValue()) {
                     if (isCancelled()) {
+                        logger.log(Level.INFO, "Terminating file ingest due to cancellation.");
                         return null;
                     }
 
@@ -1075,6 +1077,7 @@ public class IngestManager {
 
                 @Override
                 public boolean cancel() {
+                    logger.log(Level.INFO, "Queueing ingest cancelled by user.");
                     return EnqueueWorker.this.cancel(true);
                 }
             });
@@ -1123,6 +1126,7 @@ public class IngestManager {
                 Collection<FsContent> fsContents = null;
                 for (IngestServiceAbstract service : services) {
                     if (isCancelled()) {
+                        logger.log(Level.INFO, "Terminating ingest queueing due to cancellation.");
                         return;
                     }
                     final String serviceName = service.getName();