[camel-karavan] branch main updated: Fix minor errors

[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 cc70d0d2 Fix minor errors
cc70d0d2 is described below

commit cc70d0d207ed630cdef13d1cbad6bfefb9bc414f
Author: Marat Gubaidullin <marat@Marats-MacBook-Pro.local>
AuthorDate: Tue Aug 22 10:29:36 2023 -0400

    Fix minor errors
---
 .../apache/camel/karavan/api/InfrastructureResource.java | 16 ++++++++++------
 .../org/apache/camel/karavan/api/LogWatchResource.java   |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
index 931aa2c5..b2c1e92b 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
@@ -297,13 +297,17 @@ public class InfrastructureResource {
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/services")
     public Response getServices() throws Exception {
-        if (ConfigService.inKubernetes()) {
-            return 
Response.ok(kubernetesService.getServices(kubernetesService.getNamespace())).build();
+        if (infinispanService.isReady()) {
+            if (ConfigService.inKubernetes()) {
+                return 
Response.ok(kubernetesService.getServices(kubernetesService.getNamespace())).build();
+            } else {
+                List<String> list = 
infinispanService.getContainerStatuses(environment).stream()
+                        .map(ci -> ci.getPorts().stream().map(i -> 
ci.getContainerName() + ":" + i).collect(Collectors.toList()))
+                        .flatMap(List::stream).collect(Collectors.toList());
+                return Response.ok(list).build();
+            }
         } else {
-            List<String> list = 
infinispanService.getContainerStatuses(environment).stream()
-                    .map(ci -> ci.getPorts().stream().map(i -> 
ci.getContainerName() + ":" + i).collect(Collectors.toList()))
-                    .flatMap(List::stream).collect(Collectors.toList());
-            return Response.ok(list).build();
+            return Response.ok(List.of()).build();
         }
     }
 
diff --git 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/LogWatchResource.java
 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/LogWatchResource.java
index 91e862b4..6f702dd4 100644
--- 
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/LogWatchResource.java
+++ 
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/LogWatchResource.java
@@ -84,7 +84,9 @@ public class LogWatchResource {
         LOGGER.info("LogCallback for " + name + " starting");
         try (SseEventSink sink = eventSink) {
             LogCallback logCallback = new LogCallback(line -> {
-                sink.send(sse.newEvent(line));
+                if (!sink.isClosed()) {
+                    sink.send(sse.newEvent(line));
+                }
             });
             dockerService.logContainer(name, logCallback);
             logCallback.close();