JAMES-3929 Refactor HealthCheck to have a constant for timeout that a…

…ll health checks can use if necessary Timeout needed on OpenSearchHealthCheck after upgrade, as it seems the requests was waiting forever on it.
apache · Jul 19, 2023 · 36d5d46 · 36d5d46
1 parent ee5bef7
commit 36d5d46
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.../opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java b/.../opensearch/src/main/java/org/apache/james/backends/opensearch/OpenSearchHealthCheck.java
@@ -65,6 +65,7 @@ public Mono<Result> check() {
 
         try {
             return client.health(request)
+                .timeout(HEALTH_CHECK_TIMEOUT)
                 .map(this::toHealthCheckResult)
                 .onErrorResume(e -> Mono.just(Result.unhealthy(COMPONENT_NAME, "Error while contacting cluster", e)));
         } catch (IOException e) {

diff --git a/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java b/core/src/main/java/org/apache/james/core/healthcheck/HealthCheck.java
@@ -18,9 +18,13 @@
  ****************************************************************/
 package org.apache.james.core.healthcheck;
 
+import java.time.Duration;
+
 import org.reactivestreams.Publisher;
 
 public interface HealthCheck {
+    Duration HEALTH_CHECK_TIMEOUT = Duration.ofSeconds(5);
+
     ComponentName componentName();
 
     Publisher<Result> check();

diff --git a/third-party/rspamd/src/main/java/org/apache/james/rspamd/healthcheck/RspamdHealthCheck.java b/third-party/rspamd/src/main/java/org/apache/james/rspamd/healthcheck/RspamdHealthCheck.java
@@ -19,8 +19,6 @@
 
 package org.apache.james.rspamd.healthcheck;
 
-import java.time.Duration;
-
 import javax.inject.Inject;
 
 import org.apache.james.core.healthcheck.ComponentName;
@@ -33,7 +31,6 @@
 
 public class RspamdHealthCheck implements HealthCheck {
     private static final ComponentName COMPONENT_NAME = new ComponentName("Rspamd");
-    private static final Duration HEALTH_CHECK_TIMEOUT = Duration.ofSeconds(5);
 
     private final RspamdHttpClient rspamdHttpClient;