From 8da682162d3ea63410c4e097f0d7ef7ee90c0b4c Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 22 Aug 2019 12:36:19 +0200 Subject: [PATCH] openvidu-server: docker containers stop and removal process refactoring --- .../server/recording/service/ComposedRecordingService.java | 4 +--- .../src/main/java/io/openvidu/server/utils/DockerManager.java | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java index 540beffd..e3668165 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java @@ -261,8 +261,7 @@ public class ComposedRecordingService extends RecordingService { } else { log.warn("Removing container {} for closed session {}...", containerIdAux, session.getSessionId()); - dockerManager.stopDockerContainer(containerIdAux); - dockerManager.removeDockerContainer(containerIdAux, false); + dockerManager.removeDockerContainer(containerIdAux, true); containers.remove(containerId); containerClosed = true; log.warn("Container {} for closed session {} succesfully stopped and removed", containerIdAux, @@ -433,7 +432,6 @@ public class ComposedRecordingService extends RecordingService { private void failRecordingCompletion(Recording recording, String containerId, OpenViduException e) throws OpenViduException { recording.setStatus(io.openvidu.java.client.Recording.Status.failed); - dockerManager.stopDockerContainer(containerId); dockerManager.removeDockerContainer(containerId, true); containers.remove(containerId); throw e; diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java index 3423ec87..dcc5cf0c 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java @@ -152,10 +152,6 @@ public class DockerManager { dockerClient.removeContainerCmd(containerId).withForce(force).exec(); } - public void stopDockerContainer(String containerId) { - dockerClient.stopContainerCmd(containerId).exec(); - } - public void cleanStrandedContainers(String imageName) { List existingContainers = this.dockerClient.listContainersCmd().withShowAll(true).exec(); for (Container container : existingContainers) {