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

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop

Browse Source
This commit is contained in:
raman-bt 2013-12-20 10:56:47 -05:00
commit dbca90e7c0
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -445,9 +445,16 @@ public class IngestManager {
//init all fs modules, everytime new worker starts //init all fs modules, everytime new worker starts
for (IngestModuleAbstractFile s : abstractFileModules) { for (IngestModuleAbstractFile s : abstractFileModules) {
if (fileScheduler.hasModuleEnqueued(s) == false) { // This was added at one point to remove the message about non-configured HashDB even
continue; // when HashDB was not enabled. However, it adds some problems if a second ingest is
} // kicked off whiel the first is ongoing. If the 2nd ingest has a module enabled that
// was not initially enabled, it will never have init called. We also need to call
// complete and need a similar way of passing down data to that thread to tell it which
// it shoudl call complete on (otherwise it could call complete on a module that never
// had init() called.
//if (fileScheduler.hasModuleEnqueued(s) == false) {
// continue;
//}
IngestModuleInit moduleInit = new IngestModuleInit(); IngestModuleInit moduleInit = new IngestModuleInit();
try { try {
s.init(moduleInit); s.init(moduleInit);
@ -1080,9 +1087,14 @@ public class IngestManager {
//notify modules of completion //notify modules of completion
if (!this.isCancelled()) { if (!this.isCancelled()) {
for (IngestModuleAbstractFile s : abstractFileModules) { for (IngestModuleAbstractFile s : abstractFileModules) {
try {
s.complete(); s.complete();
IngestManager.fireModuleEvent(IngestModuleEvent.COMPLETED.toString(), s.getName()); IngestManager.fireModuleEvent(IngestModuleEvent.COMPLETED.toString(), s.getName());
} }
catch (Exception ex) {
logger.log(Level.SEVERE, "Module " + s.getName() + " threw exception during call to complete()", ex);
}
}
} }
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo()); logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
@ -1093,13 +1105,11 @@ public class IngestManager {
} catch (CancellationException e) { } catch (CancellationException e) {
//task was cancelled //task was cancelled
handleInterruption(); handleInterruption();
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
handleInterruption(); handleInterruption();
} catch (ExecutionException ex) { } catch (ExecutionException ex) {
handleInterruption(); handleInterruption();
logger.log(Level.SEVERE, "Fatal error during ingest.", ex); logger.log(Level.SEVERE, "Fatal error during ingest.", ex);
} catch (Exception ex) { } catch (Exception ex) {
handleInterruption(); handleInterruption();
logger.log(Level.SEVERE, "Fatal error during ingest.", ex); logger.log(Level.SEVERE, "Fatal error during ingest.", ex);