From 670e0397831d977defa0b108f9412ac1fc0021a8 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Tue, 12 Nov 2019 14:56:30 +0100 Subject: Revert "Filter out unwanted log messages from Jersey client." --- .../vespa/util/http/VespaClientBuilderFactory.java | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'jaxrs_client_utils/src') diff --git a/jaxrs_client_utils/src/main/java/ai/vespa/util/http/VespaClientBuilderFactory.java b/jaxrs_client_utils/src/main/java/ai/vespa/util/http/VespaClientBuilderFactory.java index c242f4c6f2f..d55128069c4 100644 --- a/jaxrs_client_utils/src/main/java/ai/vespa/util/http/VespaClientBuilderFactory.java +++ b/jaxrs_client_utils/src/main/java/ai/vespa/util/http/VespaClientBuilderFactory.java @@ -4,21 +4,15 @@ package ai.vespa.util.http; import com.yahoo.security.tls.MixedMode; import com.yahoo.security.tls.TlsContext; import com.yahoo.security.tls.TransportSecurityUtils; -import org.glassfish.jersey.client.internal.HttpUrlConnector; -import org.glassfish.jersey.process.internal.ExecutorProviders; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.core.UriBuilder; import java.net.URI; -import java.util.Optional; -import java.util.logging.Filter; import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.CONFIG; - /** * Factory for JAX-RS http client builder for internal Vespa communications over http/https. * @@ -32,26 +26,6 @@ public class VespaClientBuilderFactory implements AutoCloseable { private static final Logger log = Logger.getLogger(VespaClientBuilderFactory.class.getName()); - static { - // CONFIG log message are logged repeatedly from these classes. - disableConfigLogging(HttpUrlConnector.class); - disableConfigLogging(ExecutorProviders.class); - } - - // This method will hook a filter into the Jersey logger removing unwanted messages. - private static void disableConfigLogging(Class klass) { - @SuppressWarnings("LoggerInitializedWithForeignClass") - Logger logger = Logger.getLogger(klass.getName()); - Optional currentFilter = Optional.ofNullable(logger.getFilter()); - Filter filter = logRecord -> - !logRecord.getMessage().startsWith("Restricted headers are not enabled") - && !logRecord.getMessage().startsWith("Selected ExecutorServiceProvider implementation") - && !logRecord.getLevel().equals(CONFIG) - && currentFilter.map(f -> f.isLoggable(logRecord)).orElse(true); // Honour existing filter if exists - logger.setFilter(filter); - } - - private final TlsContext tlsContext = TransportSecurityUtils.createTlsContext().orElse(null); private final MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode(); -- cgit v1.2.3