diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java index 383abbd3af..9d6c413199 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java @@ -248,7 +248,8 @@ final class IngestSearchRunner { } /** - * Task to perform periodic searches for each job (does a single index commit first) + * Task to perform periodic searches for each job (does a single index + * commit first) */ private final class PeriodicSearchTask implements Runnable { @@ -296,24 +297,23 @@ final class IngestSearchRunner { NbBundle.getMessage(this.getClass(), "SearchRunner.Searcher.done.err.msg"), ex.getMessage())); }// catch and ignore if we were cancelled - catch (java.util.concurrent.CancellationException ex) { + catch (java.util.concurrent.CancellationException ex) { } } } stopWatch.stop(); logger.log(Level.INFO, "All periodic searches cumulatively took {0} secs", stopWatch.getElapsedTimeSecs()); //NON-NLS - + // calculate "hold off" time recalculateUpdateIntervalTime(stopWatch.getElapsedTimeSecs()); // ELDEBUG - + // schedule next PeriodicSearchTask jobProcessingTaskFuture = jobProcessingExecutor.schedule(new PeriodicSearchTask(), currentUpdateIntervalMs, MILLISECONDS); - + // exit this thread return; } - - + private void recalculateUpdateIntervalTime(long lastSerchTimeSec) { // If periodic search takes more than 1/4 of the current periodic search interval, then double the search interval if (lastSerchTimeSec * 1000 < currentUpdateIntervalMs / 4) { @@ -321,7 +321,7 @@ final class IngestSearchRunner { } // double the search interval currentUpdateIntervalMs = currentUpdateIntervalMs * 2; - logger.log(Level.WARNING, "Last periodic search took {0} sec. Increasing search interval to {1} sec", new Object[]{lastSerchTimeSec, currentUpdateIntervalMs/1000}); + logger.log(Level.WARNING, "Last periodic search took {0} sec. Increasing search interval to {1} sec", new Object[]{lastSerchTimeSec, currentUpdateIntervalMs / 1000}); return; } } @@ -513,6 +513,7 @@ final class IngestSearchRunner { return null; } + logger.log(Level.INFO, String.format("Performing keyword query for search job %d: %s", job.getJobId(), keyword.getSearchTerm())); //NON-NLS final KeywordList keywordList = keywordToList.get(keyword); //new subProgress will be active after the initial query