diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/LoggedTask.java b/Core/src/org/sleuthkit/autopsy/coreutils/LoggedTask.java index 9bc3f09d27..6f8e212ca5 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/LoggedTask.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/LoggedTask.java @@ -41,7 +41,7 @@ public abstract class LoggedTask extends Task implements Cancellable { protected void cancelled() { super.cancelled(); if (logStateChanges) { - LOGGER.log(Level.WARNING, "{0} cancelled!", getTitle()); + // LOGGER.log(Level.WARNING, "{0} cancelled!", getTitle()); } } @@ -56,7 +56,7 @@ public abstract class LoggedTask extends Task implements Cancellable { protected void scheduled() { super.scheduled(); if (logStateChanges) { - LOGGER.log(Level.INFO, "{0} scheduled", getTitle()); + // LOGGER.log(Level.INFO, "{0} scheduled", getTitle()); } } @@ -69,7 +69,7 @@ public abstract class LoggedTask extends Task implements Cancellable { LOGGER.log(Level.SEVERE, getTitle() + " threw unexpected exception: ", ex); } if (logStateChanges) { - LOGGER.log(Level.INFO, "{0} succeeded", getTitle()); + // LOGGER.log(Level.INFO, "{0} succeeded", getTitle()); } } } diff --git a/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java b/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java index 2286a584d5..6b4cf50a89 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventDB.java @@ -186,7 +186,7 @@ public class EventDB { return "1"; } result = StringUtils.deleteWhitespace(result).equals("(1and1and1)") ? "1" : result; - System.out.println(result); + //System.out.println(result); return result; } @@ -402,7 +402,7 @@ public class EventDB { if (end2 == 0) { end2 = getMaxTime(); } - System.out.println(start2 + " " + start + " " + end + " " + end2); + //System.out.println(start2 + " " + start + " " + end + " " + end2); return new Interval(start2 * 1000, (end2 + 1) * 1000, TimeLineController.getJodaTimeZone()); } } catch (SQLException ex) { @@ -445,7 +445,7 @@ public class EventDB { dbReadLock(); final String query = "select event_id from events where time >= " + startTime + " and time <" + endTime + " and " + getSQLWhere(filter); - System.out.println(query); + //System.out.println(query); try (Statement stmt = con.createStatement(); ResultSet rs = stmt.executeQuery(query)) { @@ -801,13 +801,13 @@ public class EventDB { ResultSet rs = null; dbReadLock(); - System.out.println(queryString); + //System.out.println(queryString); try (Statement stmt = con.createStatement();) { Stopwatch stopwatch = new Stopwatch(); stopwatch.start(); rs = stmt.executeQuery(queryString); stopwatch.stop(); - System.out.println(stopwatch.elapsedMillis() / 1000.0 + " seconds"); + // System.out.println(stopwatch.elapsedMillis() / 1000.0 + " seconds"); while (rs.next()) { EventType type = useSubTypes @@ -880,7 +880,7 @@ public class EventDB { + " from events where time >= " + start + " and time < " + end + " and " + getSQLWhere(filter) + " group by interval, " + (useSubTypes ? SUB_TYPE_COLUMN : BASE_TYPE_COLUMN) + " , " + descriptionColumn + " order by Min(time)"; - System.out.println(query); + //System.out.println(query); ResultSet rs = null; try (Statement stmt = con.createStatement(); // scoop up requested events in groups organized by interval, type, and desription ) { @@ -890,7 +890,7 @@ public class EventDB { rs = stmt.executeQuery(query); stopwatch.stop(); - System.out.println(stopwatch.elapsedMillis() / 1000.0 + " seconds"); + //System.out.println(stopwatch.elapsedMillis() / 1000.0 + " seconds"); while (rs.next()) { EventType type = useSubTypes ? RootEventType.allTypes.get(rs.getInt(SUB_TYPE_COLUMN)) : BaseTypes.values()[rs.getInt(BASE_TYPE_COLUMN)]; diff --git a/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java b/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java index f1b0cb26f3..6a17153ec9 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/events/db/EventsRepository.java @@ -109,13 +109,13 @@ public class EventsRepository { this.eventDB = EventDB.getEventDB(Case.getCurrentCase().getCaseDirectory()); idToEventCache = CacheBuilder.newBuilder().maximumSize(5000L).expireAfterAccess(10, TimeUnit.MINUTES).removalListener((RemovalNotification rn) -> { - LOGGER.log(Level.INFO, "evicting event: {0}", rn.toString()); + //LOGGER.log(Level.INFO, "evicting event: {0}", rn.toString()); }).build(CacheLoader.from(eventDB::getEventById)); eventCountsCache = CacheBuilder.newBuilder().maximumSize(1000L).expireAfterAccess(10, TimeUnit.MINUTES).removalListener((RemovalNotification> rn) -> { - LOGGER.log(Level.INFO, "evicting counts: {0}", rn.toString()); + //LOGGER.log(Level.INFO, "evicting counts: {0}", rn.toString()); }).build(CacheLoader.from(eventDB::countEvents)); aggregateEventsCache = CacheBuilder.newBuilder().maximumSize(1000L).expireAfterAccess(10, TimeUnit.MINUTES).removalListener((RemovalNotification> rn) -> { - LOGGER.log(Level.INFO, "evicting aggregated events: {0}", rn.toString()); + //LOGGER.log(Level.INFO, "evicting aggregated events: {0}", rn.toString()); }).build(CacheLoader.from(eventDB::getAggregatedEvents)); maxCache = CacheBuilder.newBuilder().build(CacheLoader.from(eventDB::getMaxTime)); minCache = CacheBuilder.newBuilder().build(CacheLoader.from(eventDB::getMinTime));