aboutsummaryrefslogtreecommitdiffstats
path: root/jaxrs_client_utils
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2019-11-12 14:56:30 +0100
committerGitHub <noreply@github.com>2019-11-12 14:56:30 +0100
commit670e0397831d977defa0b108f9412ac1fc0021a8 (patch)
treedfc8a29a4f4b144ec212f1fd9be77f8797f3ea04 /jaxrs_client_utils
parente2308376344d4fa36ccc4d8e72b802b5953864fe (diff)
Revert "Filter out unwanted log messages from Jersey client."
Diffstat (limited to 'jaxrs_client_utils')
-rw-r--r--jaxrs_client_utils/src/main/java/ai/vespa/util/http/VespaClientBuilderFactory.java26
1 files changed, 0 insertions, 26 deletions
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<Filter> 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();