diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java index 0d7fe8d953..49b477af3f 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java @@ -61,7 +61,7 @@ public class IngestImageThread extends SwingWorker { logger.log(Level.INFO, "Starting background processing"); - progress = ProgressHandleFactory.createHandle(service.getName() + " img:" + image.getId(), new Cancellable() { + progress = ProgressHandleFactory.createHandle(service.getName() + " image id:" + image.getId(), new Cancellable() { @Override public boolean cancel() { @@ -80,7 +80,7 @@ public class IngestImageThread extends SwingWorker { try { service.process(image, controller); } catch (Exception e) { - logger.log(Level.INFO, "Exception from service: " + service.getName(), e); + logger.log(Level.INFO, "Exception in service: " + service.getName() + " image: " + image.getName(), e); } logger.log(Level.INFO, "Done background processing"); @@ -103,10 +103,10 @@ public class IngestImageThread extends SwingWorker { service.stop(); } catch (ExecutionException ex) { service.stop(); - logger.log(Level.SEVERE, "Fatal error during image ingest.", ex); + logger.log(Level.SEVERE, "Fatal error during image ingest from sevice: " + service.getName() + " image: " + image.getName(), ex); } catch (Exception ex) { service.stop(); - logger.log(Level.SEVERE, "Fatal error during image ingest.", ex); + logger.log(Level.SEVERE, "Fatal error during image ingest in service: " + service.getName() + " image: " + image.getName(), ex); } finally { progress.finish(); diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 0c655aa14a..186c9a46ce 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -161,25 +161,23 @@ public class IngestManager { } } - //merge with queue (will not add if already exists) - + //fsContent ingester boolean startFsContentIngester = false; if (hasNextFsContent()) { if (fsContentIngester == null) { startFsContentIngester = true; - logger.log(Level.INFO, "Satrting initial FsContent Ingester"); + logger.log(Level.INFO, "Starting initial FsContent ingester"); } //if worker had completed, restart it in case data is still enqueued else if (fsContentIngester.isDone()) { startFsContentIngester = true; - logger.log(Level.INFO, "Restarting fsContent ingester thread."); + logger.log(Level.INFO, "Restarting fsContent ingester"); } } else { logger.log(Level.INFO, "no new FsContent enqueued, no ingester needed"); } - if (startFsContentIngester) { fsContentIngester = new IngestFsContentThread(); stats = new IngestManagerStats(); @@ -214,7 +212,7 @@ public class IngestManager { for (IngestImageThread imageWorker : toStop) { boolean cancelled = imageWorker.cancel(true); if (!cancelled) { - logger.log(Level.WARNING, "Unable to cancel image ingest worker " + imageWorker.getService().getName() + " img: " + imageWorker.getImage()); + logger.log(Level.WARNING, "Unable to cancel image ingest worker for service: " + imageWorker.getService().getName() + " img: " + imageWorker.getImage().getName()); } } @@ -738,10 +736,6 @@ public class IngestManager { super.get(); //block and get all exceptions thrown while doInBackground() //notify services of completion if (!this.isCancelled()) { - for (IngestServiceImage s : imageServices) { - s.complete(); - } - for (IngestServiceFsContent s : fsContentServices) { s.complete(); } diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java index ff6d36c3fb..126308054d 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java @@ -142,11 +142,11 @@ public final class IngestTopComponent extends TopComponent implements DataExplor if (oldCase == null) //nothing to do, not case had been opened return; - //clear inbox - messagePanel.clearMessages(); //stop workers if running if (manager != null) manager.stopAll(); + //clear inbox + messagePanel.clearMessages(); } } @@ -459,7 +459,7 @@ public final class IngestTopComponent extends TopComponent implements DataExplor JOptionPane.showMessageDialog( null, ingestReport, - "Ingest Summary", + "File Ingest Summary", JOptionPane.INFORMATION_MESSAGE); } diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java b/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java index 2124e996c0..8865d82d9a 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java @@ -90,7 +90,8 @@ public final class ExampleImageIngestService implements IngestServiceImage { public void complete() { logger.log(Level.INFO, "complete() " + this.toString()); - manager.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, "completed image processing")); + final IngestMessage msg = IngestMessage.createMessage(++messageId, MessageType.INFO, this, "completed image processing"); + manager.postMessage(msg); //service specific cleanup due to completion here }