Fix #32590: fix docker-swarm logs

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java

@@ -93,21 +93,7 @@ public void initialize() throws ContainerProxyException {
         portRangeTo = environment.getProperty(getPropertyPrefix() + PROPERTY_PORT_RANGE_MAX, Integer.class, -1);
     }
 
-    @Override
-    public BiConsumer<OutputStream, OutputStream> getOutputAttacher(Proxy proxy) {
-        Container c = getPrimaryContainer(proxy);
-        if (c == null) return null;
 
-        return (stdOut, stdErr) -> {
-            try {
-                LogStream logStream = dockerClient.logs(c.getId(), DockerClient.LogsParam.follow(), DockerClient.LogsParam.stdout(), DockerClient.LogsParam.stderr());
-                logStream.attach(stdOut, stdErr);
-            } catch (ClosedChannelException ignored) {
-            } catch (IOException | InterruptedException | DockerException e) {
-                log.error("Error while attaching to container output", e);
-            }
-        };
-    }
 
     @Override
     protected String getPropertyPrefix() {

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java

@@ -35,6 +35,7 @@
 import eu.openanalytics.containerproxy.model.spec.ContainerSpec;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.LogStream;
 import org.mandas.docker.client.exceptions.ConflictException;
 import org.mandas.docker.client.exceptions.ContainerNotFoundException;
 import org.mandas.docker.client.exceptions.DockerException;
@@ -52,14 +53,18 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.nio.channels.ClosedChannelException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
 @Component
@@ -267,6 +272,22 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {
         return containers;
     }
 
+    @Override
+    public BiConsumer<OutputStream, OutputStream> getOutputAttacher(Proxy proxy) {
+        Container c = getPrimaryContainer(proxy);
+        if (c == null) return null;
+
+        return (stdOut, stdErr) -> {
+            try {
+                LogStream logStream = dockerClient.logs(c.getId(), DockerClient.LogsParam.follow(), DockerClient.LogsParam.stdout(), DockerClient.LogsParam.stderr());
+                logStream.attach(stdOut, stdErr);
+            } catch (ClosedChannelException ignored) {
+            } catch (IOException | InterruptedException | DockerException e) {
+                log.error("Error while attaching to container output", e);
+            }
+        };
+    }
+
     private boolean isImagePresent(ContainerSpec spec) throws DockerException, InterruptedException {
         try {
             dockerClient.inspectImage(spec.getImage().getValue());

src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java

@@ -39,6 +39,7 @@
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
 import eu.openanalytics.containerproxy.util.Retrying;
 import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.LogStream;
 import org.mandas.docker.client.exceptions.DockerException;
 import org.mandas.docker.client.exceptions.ServiceNotFoundException;
 import org.mandas.docker.client.messages.RegistryAuth;
@@ -61,15 +62,18 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.nio.channels.ClosedChannelException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
+import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
 @Component
@@ -134,11 +138,11 @@ public Proxy startContainer(Authentication user, Container initialContainer, Con
                     .secrets(secretBinds)
                     .build();
 
-            List<NetworkAttachmentConfig> networks = spec.getNetworkConnections()
+            List<NetworkAttachmentConfig> networks = new ArrayList<>(spec.getNetworkConnections()
                 .getValueOrDefault(new ArrayList<>())
                 .stream()
                 .map(n -> NetworkAttachmentConfig.builder().target(n).build())
-                .toList();
+                .toList());
 
             if (spec.getNetwork().isPresent()) {
                 networks.add(NetworkAttachmentConfig.builder().target(spec.getNetwork().getValue()).build());
@@ -349,5 +353,21 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {
         return containers;
     }
 
+    @Override
+    public BiConsumer<OutputStream, OutputStream> getOutputAttacher(Proxy proxy) {
+        Container container = getPrimaryContainer(proxy);
+        if (container == null) return null;
+        String serviceId = container.getRuntimeObjectOrNull(BackendContainerNameKey.inst);
+
+        return (stdOut, stdErr) -> {
+            try {
+                LogStream logStream = dockerClient.serviceLogs(serviceId, DockerClient.LogsParam.follow(), DockerClient.LogsParam.stdout(), DockerClient.LogsParam.stderr());
+                logStream.attach(stdOut, stdErr);
+            } catch (ClosedChannelException ignored) {
+            } catch (IOException | InterruptedException | DockerException e) {
+                log.error("Error while attaching to container output", e);
+            }
+        };
+    }
 
 }