mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 16:06:15 +00:00
Add more info to log when ingests are cancelled.
This commit is contained in:
parent
2530da54e9
commit
4ab9dc5be7
@ -65,6 +65,7 @@ public class IngestImageThread extends SwingWorker<Object,Void> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean cancel() {
|
public boolean cancel() {
|
||||||
|
logger.log(Level.INFO, "Image ingest service " + service.getName() + " cancelled by user.");
|
||||||
return IngestImageThread.this.cancel(true);
|
return IngestImageThread.this.cancel(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -75,6 +76,7 @@ public class IngestImageThread extends SwingWorker<Object,Void> {
|
|||||||
controller = new IngestImageWorkerController(this, progress);
|
controller = new IngestImageWorkerController(this, progress);
|
||||||
|
|
||||||
if (isCancelled()) {
|
if (isCancelled()) {
|
||||||
|
logger.log(Level.INFO, "Terminating image ingest service " + service.getName() + " due to cancellation.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
@ -942,6 +942,7 @@ public class IngestManager {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean cancel() {
|
public boolean cancel() {
|
||||||
|
logger.log(Level.INFO, "Filed ingest cancelled by user.");
|
||||||
return IngestFsContentThread.this.cancel(true);
|
return IngestFsContentThread.this.cancel(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -965,6 +966,7 @@ public class IngestManager {
|
|||||||
|
|
||||||
for (IngestServiceFsContent service : unit.getValue()) {
|
for (IngestServiceFsContent service : unit.getValue()) {
|
||||||
if (isCancelled()) {
|
if (isCancelled()) {
|
||||||
|
logger.log(Level.INFO, "Terminating file ingest due to cancellation.");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1075,6 +1077,7 @@ public class IngestManager {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean cancel() {
|
public boolean cancel() {
|
||||||
|
logger.log(Level.INFO, "Queueing ingest cancelled by user.");
|
||||||
return EnqueueWorker.this.cancel(true);
|
return EnqueueWorker.this.cancel(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1123,6 +1126,7 @@ public class IngestManager {
|
|||||||
Collection<FsContent> fsContents = null;
|
Collection<FsContent> fsContents = null;
|
||||||
for (IngestServiceAbstract service : services) {
|
for (IngestServiceAbstract service : services) {
|
||||||
if (isCancelled()) {
|
if (isCancelled()) {
|
||||||
|
logger.log(Level.INFO, "Terminating ingest queueing due to cancellation.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final String serviceName = service.getName();
|
final String serviceName = service.getName();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user