From 0becded125f59c8089f0f310197f4b1c1a9147f9 Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 24 Jan 2024 16:32:18 +0100 Subject: [PATCH] checks updated --- .settings/org.eclipse.wst.common.component | 6 ++++++ .../data/access/storagehub/health/DefaultStorageCheck.java | 4 ++-- .../data/access/storagehub/health/JCRRepositoryCheck.java | 2 +- .../backend/impl/GcubeDefaultS3StorageBackendFactory.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0ab8c67..95b0487 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -151,6 +151,12 @@ + + uses + + + uses + uses diff --git a/src/main/java/org/gcube/data/access/storagehub/health/DefaultStorageCheck.java b/src/main/java/org/gcube/data/access/storagehub/health/DefaultStorageCheck.java index 710dbfc..9393bf8 100644 --- a/src/main/java/org/gcube/data/access/storagehub/health/DefaultStorageCheck.java +++ b/src/main/java/org/gcube/data/access/storagehub/health/DefaultStorageCheck.java @@ -30,10 +30,10 @@ public class DefaultStorageCheck implements HealthCheck{ if (((S3Backend)storageFactory.create(defaultPayload)).isAlive()) return HealthCheckResponse.builder(getName()).up().build(); else - return HealthCheckResponse.builder(getName()).down().withMessage("error contacting storage").build(); + return HealthCheckResponse.builder(getName()).down().error("error contacting storage").build(); } catch (Exception e) { log.error("error checking defaultStorage",e); - return HealthCheckResponse.builder(getName()).down().withMessage(e.getMessage()).build(); + return HealthCheckResponse.builder(getName()).down().error(e.getMessage()).build(); } } diff --git a/src/main/java/org/gcube/data/access/storagehub/health/JCRRepositoryCheck.java b/src/main/java/org/gcube/data/access/storagehub/health/JCRRepositoryCheck.java index 2cd2bcb..d5b5d1e 100644 --- a/src/main/java/org/gcube/data/access/storagehub/health/JCRRepositoryCheck.java +++ b/src/main/java/org/gcube/data/access/storagehub/health/JCRRepositoryCheck.java @@ -24,7 +24,7 @@ public class JCRRepositoryCheck implements HealthCheck{ return HealthCheckResponse.builder(getName()).up().build(); }catch (LoginException e) { } catch(Throwable ex) { - return HealthCheckResponse.builder(getName()).down().withMessage(ex.getMessage()).build(); + return HealthCheckResponse.builder(getName()).down().error(ex.getMessage()).build(); } return HealthCheckResponse.builder(getName()).up().build(); } diff --git a/src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultS3StorageBackendFactory.java b/src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultS3StorageBackendFactory.java index 1e380e2..4b06683 100644 --- a/src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultS3StorageBackendFactory.java +++ b/src/main/java/org/gcube/data/access/storagehub/storage/backend/impl/GcubeDefaultS3StorageBackendFactory.java @@ -46,7 +46,7 @@ public class GcubeDefaultS3StorageBackendFactory implements StorageBackendFactor if (payloadConfiguration.getParameters().isEmpty()) return singleton; - throw new InvalidCallParameters("gcubeMinIo created with not empty parameters"); + throw new InvalidCallParameters("S3 created with not empty parameters"); } private Metadata getParameters(){