This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch harmonize-minimal-setup in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit db6432daf3deffbbfed796a5a2ed2fdde2417b19 Author: Dominik Riemer <[email protected]> AuthorDate: Fri Nov 3 22:20:44 2023 +0100 Improve exception logging, remove startup check --- .../apache/streampipes/manager/endpoint/EndpointItemFetcher.java | 2 +- .../org/apache/streampipes/manager/health/ServiceHealthCheck.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/endpoint/EndpointItemFetcher.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/endpoint/EndpointItemFetcher.java index 2fd3a4ef9..6139ba15d 100644 --- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/endpoint/EndpointItemFetcher.java +++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/endpoint/EndpointItemFetcher.java @@ -59,7 +59,7 @@ public class EndpointItemFetcher { .readValue(result, new TypeReference<>() { }); } catch (IOException e1) { - logger.warn("Processing Element Descriptions could not be fetched from endpoint: " + e.getEndpointUrl(), e1); + logger.warn("Processing Element Descriptions could not be fetched from endpoint {}: {} ", e.getEndpointUrl(), e1.getMessage()); return Collections.emptyList(); } } diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java index 88c9292ae..abb1dc5ea 100644 --- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java +++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/health/ServiceHealthCheck.java @@ -56,7 +56,7 @@ public class ServiceHealthCheck implements Runnable { try { var request = ExtensionServiceExecutions.extServiceGetRequest(healthCheckUrl); var response = request.execute(); - if (response.returnResponse().getStatusLine().getStatusCode() != HttpStatus.SC_OK && !isStarting(service)) { + if (response.returnResponse().getStatusLine().getStatusCode() != HttpStatus.SC_OK) { processUnhealthyService(service); } else { if (service.getStatus() == SpServiceStatus.UNHEALTHY) { @@ -68,10 +68,6 @@ public class ServiceHealthCheck implements Runnable { } } - private boolean isStarting(SpServiceRegistration service) { - return service.getStatus() == SpServiceStatus.REGISTERED || service.getStatus() == SpServiceStatus.MIGRATING; - } - private void processUnhealthyService(SpServiceRegistration service) { if (service.getStatus() == SpServiceStatus.HEALTHY) { serviceRegistrationManager.applyServiceStatus(
