diff options
author | Harald Musum <musum@yahooinc.com> | 2023-03-13 13:34:46 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-03-13 13:34:46 +0100 |
commit | 29480c27385fe2b0375e82628832d0b9693e3c70 (patch) | |
tree | a060354149763a310b704a4fe17421d9329da13c /config-model/src/main/java/com | |
parent | 83de4426dda20c34aff131ffa2ba767d17c4b9f4 (diff) |
Turn off info logging for some classes
Unimportant logging for external code that we want to avoid in vespa log
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 19 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 317c3646dde..8c039c352f9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -24,12 +24,14 @@ import com.yahoo.vespa.model.admin.monitoring.Monitoring; import com.yahoo.vespa.model.admin.monitoring.builder.Metrics; import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer; import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProvider; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty; @@ -41,8 +43,6 @@ import static com.yahoo.vespa.model.admin.monitoring.MetricSet.empty; */ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Serializable { - private static final long serialVersionUID = 1L; - private final boolean isHostedVespa; private final Monitoring monitoring; private final List<Configserver> configservers = new ArrayList<>(); @@ -101,6 +101,7 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri this.multitenant = multitenant; this.fileDistribution = new FileDistributionConfigProducer(parent); this.applicationType = applicationType; + this.logctlSpecs.addAll(setDefaultLogctlSpecs()); } public Configserver getConfigserver() { return defaultConfigserver; } @@ -331,4 +332,16 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri public ApplicationType getApplicationType() { return applicationType; } + private static Set<LogctlSpec> setDefaultLogctlSpecs() { + // Turn off info logging for all container services for some classes (unimportant log messages that create noise in vespa log) + return Stream.of("configserver", "container", "container-clustercontroller", "logserver-container", "metricsproxy-container").map( + service -> List.of( + new LogctlSpec(service + ":com.yahoo.vespa.spifly.repackaged.spifly.BaseActivator", "info=off"), + new LogctlSpec(service + ":org.eclipse.jetty.server.Server", "info=off"), + new LogctlSpec(service + ":org.eclipse.jetty.server.handler.ContextHandler", "info=off"), + new LogctlSpec(service + ":org.eclipse.jetty.server.AbstractConnector", "info=off"))) + .flatMap(List::stream) + .collect(Collectors.toSet()); + } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java index 57113ff794f..69c64c97316 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java @@ -23,9 +23,7 @@ import com.yahoo.vespa.model.admin.monitoring.builder.xml.MetricsBuilder; import org.w3c.dom.Element; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; /** |