diff options
author | Harald Musum <musum@yahooinc.com> | 2021-11-08 09:08:12 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-11-08 09:08:12 +0100 |
commit | fd9968cbcf9fcd15b046fa91d68e93948193c3d8 (patch) | |
tree | 52f5bc38987a8758bee0ae20663e511a2bc65cd3 | |
parent | a6aede7c79dcda9bee20174296b9673d9e0b32b1 (diff) |
Remove support for filtering of metric events
Property is undocumented, was ued when we had yinst and metric events
are going away as well.
-rw-r--r-- | logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java index 0e9eeefcc46..0b44e47f183 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java @@ -1,10 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.logserver.handlers.archive; -import java.util.logging.Level; import com.yahoo.log.LogMessage; -import com.yahoo.logserver.filter.LogFilter; -import com.yahoo.logserver.filter.LogFilterManager; import com.yahoo.logserver.handlers.AbstractLogHandler; import java.io.File; @@ -14,6 +11,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Iterator; import java.util.TimeZone; +import java.util.logging.Level; import java.util.logging.Logger; @@ -44,7 +42,7 @@ public class ArchiverHandler extends AbstractLogHandler { /** * Max number of log files open at any given time */ - private final int maxFilesOpen = 100; + private static final int maxFilesOpen = 100; /** * The maximum number of bytes we allow a file to grow to @@ -68,11 +66,6 @@ public class ArchiverHandler extends AbstractLogHandler { */ private final LogWriterLRUCache logWriterLRUCache; - /** - * Filtering - */ - private LogFilter filter = null; - private FilesArchived filesArchived; /** @@ -83,17 +76,10 @@ public class ArchiverHandler extends AbstractLogHandler { dateformat = new SimpleDateFormat("yyyy/MM/dd/HH"); dateformat.setTimeZone(TimeZone.getTimeZone("UTC")); - // Set up filtering - String archiveMetrics = System.getProperty("vespa_log_server__archive_metric"); - if ("off".equals(archiveMetrics)) { - filter = LogFilterManager.getLogFilter("system.nometricsevents"); - } - - setLogFilter(filter); + setLogFilter(null); // set up LRU for files - logWriterLRUCache = new LogWriterLRUCache(maxFilesOpen, - (float) 0.75); + logWriterLRUCache = new LogWriterLRUCache(maxFilesOpen, (float) 0.75); } /** |