Merge pull request #26500 from vespa-engine/hmusum/turn-off-some-logging-3

Reduce log level for some loggers

1 files changed, 18 insertions, 4 deletions

diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
index de39e603175..a2397349e40 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
@@ -2,6 +2,7 @@
 package com.yahoo.log;
 
 import java.io.UnsupportedEncodingException;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.StreamHandler;
@@ -13,6 +14,13 @@ import java.util.logging.StreamHandler;
 @SuppressWarnings("deprecation")
 class VespaLogHandler extends StreamHandler {
 
+    // Reduce log level from info level to fine level for some loggers
+    private static final Set<String> loggersWithReducedLogLevel =
+            Set.of("com.yahoo.vespa.spifly.repackaged.spifly.BaseActivator",
+                   "org.eclipse.jetty.server.Server",
+                   "org.eclipse.jetty.server.handler.ContextHandler",
+                   "org.eclipse.jetty.server.AbstractConnector");
+
     private final LogTarget logTarget;
     private final String serviceName;
     private final String appPrefix;
@@ -47,10 +55,10 @@ class VespaLogHandler extends StreamHandler {
      */
     @Override
     public synchronized void publish(LogRecord record) {
-        Level level = record.getLevel();
-        String component = record.getLoggerName();
+        String loggerName = record.getLoggerName();
+        Level level = possiblyReduceLogLevel(loggerName, record.getLevel());
 
-        LevelController ctrl = getLevelControl(component);
+        LevelController ctrl = getLevelControl(loggerName);
         if (!ctrl.shouldLog(level)) {
             return;
         }
@@ -73,12 +81,18 @@ class VespaLogHandler extends StreamHandler {
         closeFileTarget();
     }
 
+    private static Level possiblyReduceLogLevel(String loggerName, Level level) {
+        if (loggerName == null) return level;
+
+        return (loggersWithReducedLogLevel.contains(loggerName) && level == Level.INFO) ? Level.FINE : level;
+    }
+
     LevelController getLevelControl(String component) {
         return repo.getLevelController(component);
     }
 
     /**
-     * Initalize the handler.  The main invariant is that
+     * Initialize the handler.  The main invariant is that
      * outputStream is always set to something valid when this method
      * returns.
      */