You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/04/17 00:32:10 UTC
[james-project] 18/39: JAMES-3117 Add logging for callers of
HealthChecks
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f98c58f7f7f7dad2c20654e5367f8462917aae33
Author: LanKhuat <kh...@gmail.com>
AuthorDate: Wed Apr 1 02:16:37 2020 +0700
JAMES-3117 Add logging for callers of HealthChecks
---
.../org/apache/james/PeriodicalHealthChecks.java | 32 ++++++++++++++++------
.../james/webadmin/routes/HealthCheckRoutes.java | 2 +-
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
index 11a82d6..acede14 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/PeriodicalHealthChecks.java
@@ -78,25 +78,39 @@ public class PeriodicalHealthChecks implements Startable {
case HEALTHY:
break;
case DEGRADED:
- LOGGER.warn("DEGRADED: {} : {}", result.getComponentName().getName(), result.getCause());
+ LOGGER.warn("DEGRADED: {} : {}",
+ result.getComponentName().getName(),
+ result.getCause().orElse(""));
break;
case UNHEALTHY:
- if (result.getError().isPresent()) {
- LOGGER.error("UNHEALTHY: {} : {} : {}", result.getComponentName().getName(), result.getCause(), result.getError().get());
- break;
- }
-
- LOGGER.error("UNHEALTHY: {} : {}", result.getComponentName().getName(), result.getCause());
+ logUnhealthy(result);
break;
}
}
+ private void logUnhealthy(Result result) {
+ if (result.getError().isPresent()) {
+ LOGGER.error("UNHEALTHY: {} : {}",
+ result.getComponentName().getName(),
+ result.getCause(),
+ result.getError().get());
+ } else {
+ LOGGER.error("UNHEALTHY: {} : {}",
+ result.getComponentName().getName(),
+ result.getCause());
+ }
+ }
+
private void logError(Throwable error, Object triggeringValue) {
if (triggeringValue instanceof Result) {
Result result = (Result) triggeringValue;
- LOGGER.error("HealthCheck error for: {}, Cause: {}", result.getComponentName(), error);
+ LOGGER.error("HealthCheck error for: {}, Cause: {}",
+ result.getComponentName(),
+ error);
return;
}
- LOGGER.error("HealthCheck error. Triggering value: {}, Cause: {}", triggeringValue, error);
+ LOGGER.error("HealthCheck error. Triggering value: {}, Cause: {}",
+ triggeringValue,
+ error);
}
}
\ No newline at end of file
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
index 3f422ba..12051af 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/routes/HealthCheckRoutes.java
@@ -153,7 +153,7 @@ public class HealthCheckRoutes implements PublicRoutes {
switch (result.getStatus()) {
case UNHEALTHY:
if (result.getError().isPresent()) {
- LOGGER.error("HealthCheck failed for {} : {} : {}",
+ LOGGER.error("HealthCheck failed for {} : {}",
result.getComponentName().getName(),
result.getCause().orElse(""),
result.getError().get());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org