From cb3ebedf9cd2840a4ea52724eafe522bd897bf20 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Thu, 2 Nov 2017 15:38:12 -0400 Subject: [PATCH] Progress monitor and logging updates --- .../autopsy/experimental/autoingest/AddArchiveTask.java | 3 ++- .../experimental/autoingest/ArchiveExtractorDSProcessor.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java index add8617ae9..98f36d6273 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java @@ -111,7 +111,8 @@ class AddArchiveTask implements Runnable { return; } - // extract contents of ZIP archive into destination folder + // extract contents of ZIP archive into destination folder + progressMonitor.setProgressText(String.format("Extracting archive contents to: %s", destinationFolder.toString())); List extractedFiles = ArchiveUtil.unpackArchiveFile(archivePath, destinationFolder.toString()); // do processing diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java index 0e75e4c200..dee9879dec 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/ArchiveExtractorDSProcessor.java @@ -175,7 +175,7 @@ public class ArchiveExtractorDSProcessor implements DataSourceProcessor, AutoIng public void cancel() { if (null != jobProcessingTaskFuture) { jobProcessingTaskFuture.cancel(true); - jobProcessingExecutor.shutdownNow(); + jobProcessingExecutor.shutdown(); // ELTBD - do we want to wait for the cancellation to complete? I think not, // given that the cancelation is of "best effort" variety }