ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: docker containers stop and removal process refactoring

pull/375/head
pabloFuente 2019-08-22 12:36:19 +02:00
parent c3da6e9b8b
commit 8da682162d
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
View File

@ -261,8 +261,7 @@ public class ComposedRecordingService extends RecordingService {
} else { } else {
log.warn("Removing container {} for closed session {}...", containerIdAux, log.warn("Removing container {} for closed session {}...", containerIdAux,
session.getSessionId()); session.getSessionId());
dockerManager.stopDockerContainer(containerIdAux); dockerManager.removeDockerContainer(containerIdAux, true);
dockerManager.removeDockerContainer(containerIdAux, false);
containers.remove(containerId); containers.remove(containerId);
containerClosed = true; containerClosed = true;
log.warn("Container {} for closed session {} succesfully stopped and removed", containerIdAux, 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) private void failRecordingCompletion(Recording recording, String containerId, OpenViduException e)
throws OpenViduException { throws OpenViduException {
recording.setStatus(io.openvidu.java.client.Recording.Status.failed); recording.setStatus(io.openvidu.java.client.Recording.Status.failed);
dockerManager.stopDockerContainer(containerId);
dockerManager.removeDockerContainer(containerId, true); dockerManager.removeDockerContainer(containerId, true);
containers.remove(containerId); containers.remove(containerId);
throw e; throw e;

4
openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java
View File

@ -152,10 +152,6 @@ public class DockerManager {
dockerClient.removeContainerCmd(containerId).withForce(force).exec(); dockerClient.removeContainerCmd(containerId).withForce(force).exec();
} }
public void stopDockerContainer(String containerId) {
dockerClient.stopContainerCmd(containerId).exec();
}
public void cleanStrandedContainers(String imageName) { public void cleanStrandedContainers(String imageName) {
List<Container> existingContainers = this.dockerClient.listContainersCmd().withShowAll(true).exec(); List<Container> existingContainers = this.dockerClient.listContainersCmd().withShowAll(true).exec();
for (Container container : existingContainers) { for (Container container : existingContainers) {