From 6e604d2d00c7663a33dae559b654862380a27d52 Mon Sep 17 00:00:00 2001 From: "w.richter@telekom.de" Date: Thu, 22 Aug 2024 10:43:11 +0200 Subject: [PATCH 1/3] fix: set lastOpened from former circuit breaker --- .../horizon/comet/service/CircuitBreakerCacheService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/telekom/horizon/comet/service/CircuitBreakerCacheService.java b/src/main/java/de/telekom/horizon/comet/service/CircuitBreakerCacheService.java index c5eae52..b3c1ede 100644 --- a/src/main/java/de/telekom/horizon/comet/service/CircuitBreakerCacheService.java +++ b/src/main/java/de/telekom/horizon/comet/service/CircuitBreakerCacheService.java @@ -81,7 +81,7 @@ public void openCircuitBreaker(String subscriptionId, String eventType, String o if (result.isPresent()) { CircuitBreakerMessage existingCircuitBreakerMessage = result.get(); newCircuitBreakerMessage.setLoopCounter(existingCircuitBreakerMessage.getLoopCounter()); - newCircuitBreakerMessage.setLastOpened(Date.from(Instant.now())); + newCircuitBreakerMessage.setLastOpened(existingCircuitBreakerMessage.getLastOpened()); } circuitBreakerCache.set(subscriptionId, newCircuitBreakerMessage); } catch (JsonCacheException e) { From acbd9484306d94ffbafb4ec5168c0820966e3f6d Mon Sep 17 00:00:00 2001 From: "w.richter@telekom.de" Date: Fri, 23 Aug 2024 10:32:41 +0200 Subject: [PATCH 2/3] fix: updated horizon parent to 0.0.0-fix-loop-detection-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a79e97a..a3306de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ awaitilityVersion=4.2.0 httpClientVersion=4.5.14 mockitoInlineVersion=5.2.0 -horizonParentVersion=4.2.0 +horizonParentVersion=0.0.0-fix-loop-detection-SNAPSHOT wiremockStandaloneVersion=3.3.1 \ No newline at end of file From 719c2aac509b6a831de299c7eb77524105cc5f8a Mon Sep 17 00:00:00 2001 From: "w.richter@telekom.de" Date: Fri, 23 Aug 2024 15:13:47 +0200 Subject: [PATCH 3/3] fix: updated horizon parent to 4.2.1 --- .gitignore | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2b3922f..fd3a62e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ -application-dev.yaml +application-dev*.yaml ### STS ### .apt_generated diff --git a/gradle.properties b/gradle.properties index a3306de..1302186 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ awaitilityVersion=4.2.0 httpClientVersion=4.5.14 mockitoInlineVersion=5.2.0 -horizonParentVersion=0.0.0-fix-loop-detection-SNAPSHOT +horizonParentVersion=4.2.1 wiremockStandaloneVersion=3.3.1 \ No newline at end of file