(camel-karavan) branch main updated: Updates for #1115

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new 64b82f15 Updates for #1115
64b82f15 is described below

commit 64b82f15c12b381e4505a71ecba6d6d1d4362ae5
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Feb 8 14:35:47 2024 -0500

    Updates for #1115
---
 .../main/java/org/apache/camel/karavan/cache/KaravanCacheService.java | 4 ++--
 .../java/org/apache/camel/karavan/service/ContainerStatusService.java | 4 ++--
 .../main/java/org/apache/camel/karavan/service/ProjectService.java    | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
index 6e62ba11..34b33dd4 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
@@ -62,12 +62,12 @@ public class KaravanCacheService {
     private static final String DEFAULT_ENVIRONMENT = "dev";
 
     void onStart(@Observes StartupEvent ev) {
-        LOGGER.info("The application is starting...");
+        LOGGER.info("KaravanCacheService is started");
         ready.set(true);
     }
 
     void onStop(@Observes ShutdownEvent ev) {
-        LOGGER.info("The application is stopping...");
+        LOGGER.info("KaravanCacheService is stopped");
         ready.set(false);
     }
 
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
index b5458262..e8d34d20 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
@@ -78,9 +78,9 @@ public class ContainerStatusService {
     void cleanContainersStatuses(List<ContainerStatus> statusesInDocker) {
         if (karavanCacheService.isReady() && !ConfigService.inKubernetes()) {
             List<String> namesInDocker = 
statusesInDocker.stream().map(ContainerStatus::getContainerName).toList();
-            List<ContainerStatus> statusesInInfinispan = 
karavanCacheService.getContainerStatuses(environment);
+            List<ContainerStatus> statusesInCache = 
karavanCacheService.getContainerStatuses(environment);
             // clean deleted
-            statusesInInfinispan.stream()
+            statusesInCache.stream()
                     .filter(cs -> !checkTransit(cs))
                     .filter(cs -> 
!namesInDocker.contains(cs.getContainerName()))
                     .forEach(containerStatus -> {
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index 528d54fd..e3f2aa1a 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -41,6 +41,7 @@ import 
org.apache.camel.karavan.validation.project.ProjectModifyValidator;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.eclipse.microprofile.faulttolerance.Retry;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;
@@ -266,7 +267,7 @@ public class ProjectService implements HealthCheck {
         return codeService.getProjectPort(projectId);
     }
 
-    //    @Retry(maxRetries = 100, delay = 2000)
+    @Retry(maxRetries = 100, delay = 2000)
     public void tryStart() throws Exception {
         if (karavanCacheService.isReady() && gitService.checkGit()) {
             if (karavanCacheService.getProjects().isEmpty()) {