diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java index 400c452c1e..fc02b0e9f4 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java @@ -37,8 +37,8 @@ import org.sleuthkit.autopsy.core.UserPreferences; public final class ExecUtil { private static final Logger logger = Logger.getLogger(ExecUtil.class.getName()); - private static final long DEFAULT_TIMEOUT = 5; - private static final TimeUnit DEFAULT_TIMEOUT_UNITS = TimeUnit.SECONDS; + private static final long DEFAULT_CHECK_INTERVAL = 5; + private static final TimeUnit DEFAULT_CHECK_INTERVAL_UNITS = TimeUnit.SECONDS; /** * The execute() methods do a wait() with a timeout on the executing process @@ -153,7 +153,7 @@ public final class ExecUtil { * @throws IOException If an I/O error occurs. */ public static int execute(ProcessBuilder processBuilder, ProcessTerminator terminator) throws SecurityException, IOException { - return ExecUtil.execute(processBuilder, ExecUtil.DEFAULT_TIMEOUT, ExecUtil.DEFAULT_TIMEOUT_UNITS, terminator); + return ExecUtil.execute(processBuilder, ExecUtil.DEFAULT_CHECK_INTERVAL, ExecUtil.DEFAULT_CHECK_INTERVAL_UNITS, terminator); } /** diff --git a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java index e20ebb8daa..c9fad6c1bc 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java @@ -83,7 +83,9 @@ public class PlasoIngestModule implements DataSourceIngestModule { private static final String PSORT_EXECUTABLE = "psort.exe";//NON-NLS private static final String COOKIE = "cookie";//NON-NLS private static final int LOG2TIMELINE_WORKERS = 2; - + private static final long TERMINATION_CHECK_INTERVAL = 5; + private static final TimeUnit TERMINATION_CHECK_INTERVAL_UNITS = TimeUnit.SECONDS; + private File log2TimeLineExecutable; private File psortExecutable; @@ -164,7 +166,7 @@ public class PlasoIngestModule implements DataSourceIngestModule { try (BufferedReader log2TimeLineOutpout = new BufferedReader(new InputStreamReader(log2TimeLineProcess.getInputStream()))) { L2TStatusProcessor statusReader = new L2TStatusProcessor(log2TimeLineOutpout, statusHelper, moduleOutputPath); new Thread(statusReader, "log2timeline status reader").start(); //NON-NLS - ExecUtil.waitForTermination(LOG2TIMELINE_EXECUTABLE, log2TimeLineProcess, 5, TimeUnit.SECONDS, new DataSourceIngestModuleProcessTerminator(context)); + ExecUtil.waitForTermination(LOG2TIMELINE_EXECUTABLE, log2TimeLineProcess, TERMINATION_CHECK_INTERVAL, TERMINATION_CHECK_INTERVAL_UNITS, new DataSourceIngestModuleProcessTerminator(context)); statusReader.cancel(); }