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

Merge pull request #7633 from gdicristofaro/8363_developIngestFix

Browse Source 
8363 develop ingest fix
This commit is contained in:
eugene7646 2022-06-14 16:51:20 -04:00 committed by GitHub
commit aa2c230055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java
View File

@ -509,13 +509,18 @@ public class CommandLineIngestManager extends CommandLineManager {
if (settingsWarnings.isEmpty()) { if (settingsWarnings.isEmpty()) {
IngestJobStartResult ingestJobStartResult = IngestManager.getInstance().beginIngestJob(dataSource.getContent(), ingestJobSettings); IngestJobStartResult ingestJobStartResult = IngestManager.getInstance().beginIngestJob(dataSource.getContent(), ingestJobSettings);
IngestJob ingestJob = ingestJobStartResult.getJob(); IngestJob ingestJob = ingestJobStartResult.getJob();
if (null != ingestJob) { if (null != ingestJob) {
/* /*
* Block until notified by the ingest job event * Block until notified by the ingest job event listener
* listener or until interrupted because auto ingest * or until interrupted because auto ingest is shutting
* is shutting down. * down. For very small jobs, it is possible that ingest has
* completed by the time we get here, so check periodically
* in case the event was missed.
*/ */
ingestLock.wait(); while (IngestManager.getInstance().isIngestRunning()) {
ingestLock.wait(60000); // Check every minute
}
LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath()); LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath());
IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot(); IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot();

2
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java
View File

@ -2819,7 +2819,7 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
* in case the event was missed. * in case the event was missed.
*/ */
while (IngestManager.getInstance().isIngestRunning()) { while (IngestManager.getInstance().isIngestRunning()) {
ingestLock.wait(300000); // Check every five minutes ingestLock.wait(60000); // Check every minute
} }
IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot(); IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot();