[knox] branch master updated: KNOX-2771 - Log HTTP client config parameters such as socket timeouts with info level (#602)

[sm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 40139df79 KNOX-2771 - Log HTTP client config parameters such as socket timeouts with info level (#602)
40139df79 is described below

commit 40139df79cf5434417237d115984a341236c1a37
Author: MrtnBalazs <77...@users.noreply.github.com>
AuthorDate: Wed Jul 6 20:56:01 2022 +0200

    KNOX-2771 - Log HTTP client config parameters such as socket timeouts with info level (#602)
---
 .../java/org/apache/knox/gateway/SpiGatewayMessages.java     | 12 +++++++++---
 .../knox/gateway/dispatch/DefaultHttpClientFactory.java      |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java b/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
index a19c31a40..29c6c9209 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/SpiGatewayMessages.java
@@ -91,11 +91,11 @@ public interface SpiGatewayMessages {
             text = "The dispatch to {0} was disallowed because it fails the dispatch whitelist validation. See documentation for dispatch whitelisting." )
   void dispatchDisallowed(String uri);
 
-  @Message( level = MessageLevel.DEBUG, text = "HTTP client connection timeout is set to {0} for {1}" )
+  @Message( level = MessageLevel.INFO, text = "HTTP client connection timeout is set to {0} ms for {1}" )
   void setHttpClientConnectionTimeout(int connectionTimeout, String serviceRole);
 
-  @Message( level = MessageLevel.DEBUG, text = "HTTP client socket timeout is set to {0} for {1}" )
-  void setHttpClientSocketTimeout(int csocketTimeout, String serviceRole);
+  @Message( level = MessageLevel.INFO, text = "HTTP client socket timeout is set to {0} ms for {1}" )
+  void setHttpClientSocketTimeout(int socketTimeout, String serviceRole);
 
   @Message( level = MessageLevel.DEBUG, text = "replayBufferSize is set to {0} for {1}" )
   void setReplayBufferSize(int replayBufferSize, String serviceRole);
@@ -108,4 +108,10 @@ public interface SpiGatewayMessages {
 
   @Message( level = MessageLevel.DEBUG, text = "Skipped adding outbound header {0} and value {1}" )
   void skippedOutboundHeader(String header, String value);
+
+  @Message( level = MessageLevel.INFO, text = "HTTP client retry count is set to {0} for {1}" )
+  void setRetryCount(int retryCount, String serviceRole);
+
+  @Message( level = MessageLevel.INFO, text = "HTTP client retry non safe request is set to {0} for {1}" )
+  void setRetryNonIndependent(boolean retryNonIndependent, String serviceRole);
 }
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
index f3aa4fb11..71b2cdaaf 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/DefaultHttpClientFactory.java
@@ -128,6 +128,7 @@ public class DefaultHttpClientFactory implements HttpClientFactory {
 
     if (doesRetryParamExist(filterConfig)) {
       int retryCount = Integer.parseInt(filterConfig.getInitParameter(PARAMETER_RETRY_COUNT));
+      LOG.setRetryCount(retryCount, serviceRole);
       /* do we want to retry non-idempotent requests? default no */
       boolean retryNonIdempotent = DEFAULT_PARAMETER_RETRY_NON_SAFE_REQUEST;
       if (filterConfig.getInitParameter(PARAMETER_RETRY_NON_SAFE_REQUEST)
@@ -135,6 +136,7 @@ public class DefaultHttpClientFactory implements HttpClientFactory {
         retryNonIdempotent = Boolean.parseBoolean(
             filterConfig.getInitParameter(PARAMETER_RETRY_NON_SAFE_REQUEST));
       }
+      LOG.setRetryNonIndependent(retryNonIdempotent, serviceRole);
       builder.setRetryHandler(new DefaultHttpRequestRetryHandler(retryCount,
           retryNonIdempotent));
     }