mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-08 06:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: when fs worker completes, notify only fs services.

Browse Source 
improve logging and progress bars wording
This commit is contained in:
adam-m 2012-01-31 10:12:28 -05:00
parent a6259af403
commit 0c71ca2dd4
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
View File

@ -61,7 +61,7 @@ public class IngestImageThread extends SwingWorker {
logger.log(Level.INFO, "Starting background processing"); 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 @Override
public boolean cancel() { public boolean cancel() {
@ -80,7 +80,7 @@ public class IngestImageThread extends SwingWorker {
try { try {
service.process(image, controller); service.process(image, controller);
} catch (Exception e) { } 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, logger.log(Level.INFO,
"Done background processing"); "Done background processing");
@ -103,10 +103,10 @@ public class IngestImageThread extends SwingWorker {
service.stop(); service.stop();
} catch (ExecutionException ex) { } catch (ExecutionException ex) {
service.stop(); 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) { } catch (Exception ex) {
service.stop(); 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 { } finally {
progress.finish(); progress.finish();

12
Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -161,7 +161,6 @@ public class IngestManager {
} }
} }
//merge with queue (will not add if already exists)
//fsContent ingester //fsContent ingester
boolean startFsContentIngester = false; boolean startFsContentIngester = false;
@ -169,17 +168,16 @@ public class IngestManager {
if (fsContentIngester if (fsContentIngester
== null) { == null) {
startFsContentIngester = true; 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 } //if worker had completed, restart it in case data is still enqueued
else if (fsContentIngester.isDone()) { else if (fsContentIngester.isDone()) {
startFsContentIngester = true; startFsContentIngester = true;
logger.log(Level.INFO, "Restarting fsContent ingester thread."); logger.log(Level.INFO, "Restarting fsContent ingester");
} }
} else { } else {
logger.log(Level.INFO, "no new FsContent enqueued, no ingester needed"); logger.log(Level.INFO, "no new FsContent enqueued, no ingester needed");
} }
if (startFsContentIngester) { if (startFsContentIngester) {
fsContentIngester = new IngestFsContentThread(); fsContentIngester = new IngestFsContentThread();
stats = new IngestManagerStats(); stats = new IngestManagerStats();
@ -214,7 +212,7 @@ public class IngestManager {
for (IngestImageThread imageWorker : toStop) { for (IngestImageThread imageWorker : toStop) {
boolean cancelled = imageWorker.cancel(true); boolean cancelled = imageWorker.cancel(true);
if (!cancelled) { 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() super.get(); //block and get all exceptions thrown while doInBackground()
//notify services of completion //notify services of completion
if (!this.isCancelled()) { if (!this.isCancelled()) {
for (IngestServiceImage s : imageServices) {
s.complete();
}
for (IngestServiceFsContent s : fsContentServices) { for (IngestServiceFsContent s : fsContentServices) {
s.complete(); s.complete();
} }

6
Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java
View File

@ -142,11 +142,11 @@ public final class IngestTopComponent extends TopComponent implements DataExplor
if (oldCase == null) if (oldCase == null)
//nothing to do, not case had been opened //nothing to do, not case had been opened
return; return;
//clear inbox
messagePanel.clearMessages();
//stop workers if running //stop workers if running
if (manager != null) if (manager != null)
manager.stopAll(); manager.stopAll();
//clear inbox
messagePanel.clearMessages();
} }
} }
@ -459,7 +459,7 @@ public final class IngestTopComponent extends TopComponent implements DataExplor
JOptionPane.showMessageDialog( JOptionPane.showMessageDialog(
null, null,
ingestReport, ingestReport,
"Ingest Summary", "File Ingest Summary",
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
} }

3
Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestService.java
View File

@ -90,7 +90,8 @@ public final class ExampleImageIngestService implements IngestServiceImage {
public void complete() { public void complete() {
logger.log(Level.INFO, "complete() " + this.toString()); 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 //service specific cleanup due to completion here
} }