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

openvidu-server: DockerManager.close

pull/546/head
pabloFuente 2020-09-28 18:26:37 +02:00
parent d039f71fdb
commit 521909c931
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java
View File

@ -216,10 +216,9 @@ public class RecordingManager {
public void checkRecordingRequirements(String openviduRecordingPath, String openviduRecordingCustomLayout) public void checkRecordingRequirements(String openviduRecordingPath, String openviduRecordingCustomLayout)
throws OpenViduException { throws OpenViduException {
if (dockerManager == null) { DockerManager dockerManager = null;
this.dockerManager = new DockerManager();
}
try { try {
dockerManager = new DockerManager();
dockerManager.checkDockerEnabled(); dockerManager.checkDockerEnabled();
} catch (OpenViduException e) { } catch (OpenViduException e) {
String message = e.getMessage(); String message = e.getMessage();
@ -238,6 +237,8 @@ public class RecordingManager {
} }
log.error(message); log.error(message);
throw e; throw e;
} finally {
dockerManager.close();
} }
this.checkRecordingPaths(openviduRecordingPath, openviduRecordingCustomLayout); this.checkRecordingPaths(openviduRecordingPath, openviduRecordingCustomLayout);
} }

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

@ -57,7 +57,7 @@ public class DockerManager {
private static final Logger log = LoggerFactory.getLogger(DockerManager.class); private static final Logger log = LoggerFactory.getLogger(DockerManager.class);
DockerClient dockerClient; private DockerClient dockerClient;
public DockerManager() { public DockerManager() {
DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
@ -246,6 +246,14 @@ public class DockerManager {
return containerInfo.getConfig().getLabels(); return containerInfo.getConfig().getLabels();
} }
public void close() {
try {
this.dockerClient.close();
} catch (IOException e) {
log.error("Error closing DockerClient: {}", e.getMessage());
}
}
static public String getDockerGatewayIp() { static public String getDockerGatewayIp() {
try { try {
return CommandExecutor.execCommand(5000, "/bin/sh", "-c", return CommandExecutor.execCommand(5000, "/bin/sh", "-c",