From 1fab7743972b3340f3f0aa53d44bebe8f42d3488 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 18 Nov 2020 13:09:56 +0100 Subject: [PATCH] openvidu-server: DockerManager interface --- .../recording/service/ComposedRecordingService.java | 6 +++--- .../server/recording/service/RecordingManager.java | 10 +++++----- .../{DockerManager.java => LocalDockerManager.java} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename openvidu-server/src/main/java/io/openvidu/server/utils/{DockerManager.java => LocalDockerManager.java} (98%) 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 9ecb3062..09350bf9 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 @@ -58,7 +58,7 @@ import io.openvidu.server.recording.RecordingDownloader; import io.openvidu.server.recording.RecordingInfoUtils; import io.openvidu.server.recording.RecordingUploader; import io.openvidu.server.rest.RequestMappings; -import io.openvidu.server.utils.DockerManager; +import io.openvidu.server.utils.LocalDockerManager; import io.openvidu.server.utils.QuarantineKiller; public class ComposedRecordingService extends RecordingService { @@ -69,13 +69,13 @@ public class ComposedRecordingService extends RecordingService { protected Map sessionsContainers = new ConcurrentHashMap<>(); private Map composites = new ConcurrentHashMap<>(); - protected DockerManager dockerManager; + protected LocalDockerManager dockerManager; public ComposedRecordingService(RecordingManager recordingManager, RecordingDownloader recordingDownloader, RecordingUploader recordingUploader, OpenviduConfig openviduConfig, CallDetailRecord cdr, QuarantineKiller quarantineKiller) { super(recordingManager, recordingDownloader, recordingUploader, openviduConfig, cdr, quarantineKiller); - this.dockerManager = new DockerManager(); + this.dockerManager = new LocalDockerManager(); } @Override diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java index a7127cf4..07374487 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java @@ -73,7 +73,7 @@ import io.openvidu.server.recording.Recording; import io.openvidu.server.recording.RecordingDownloader; import io.openvidu.server.recording.RecordingUploader; import io.openvidu.server.utils.CustomFileManager; -import io.openvidu.server.utils.DockerManager; +import io.openvidu.server.utils.LocalDockerManager; import io.openvidu.server.utils.JsonUtils; import io.openvidu.server.utils.QuarantineKiller; import io.openvidu.server.utils.RecordingUtils; @@ -85,7 +85,7 @@ public class RecordingManager { private ComposedRecordingService composedRecordingService; private ComposedQuickStartRecordingService composedQuickStartRecordingService; private SingleStreamRecordingService singleStreamRecordingService; - private DockerManager dockerManager; + private LocalDockerManager dockerManager; @Autowired protected SessionEventsHandler sessionHandler; @@ -164,7 +164,7 @@ public class RecordingManager { RecordingManager.IMAGE_TAG = openviduConfig.getOpenViduRecordingVersion(); - this.dockerManager = new DockerManager(); + this.dockerManager = new LocalDockerManager(); this.composedRecordingService = new ComposedRecordingService(this, recordingDownloader, recordingUploader, openviduConfig, cdr, quarantineKiller); this.composedQuickStartRecordingService = new ComposedQuickStartRecordingService(this, recordingDownloader, @@ -215,9 +215,9 @@ public class RecordingManager { public void checkRecordingRequirements(String openviduRecordingPath, String openviduRecordingCustomLayout) throws OpenViduException { - DockerManager dockerManager = null; + LocalDockerManager dockerManager = null; try { - dockerManager = new DockerManager(); + dockerManager = new LocalDockerManager(); dockerManager.checkDockerEnabled(); } catch (OpenViduException e) { String message = e.getMessage(); diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java similarity index 98% rename from openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java rename to openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java index f3ad46c4..de6f72ed 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java @@ -53,13 +53,13 @@ import io.openvidu.client.OpenViduException; import io.openvidu.client.OpenViduException.Code; import io.openvidu.server.recording.service.WaitForContainerStoppedCallback; -public class DockerManager { +public class LocalDockerManager { - private static final Logger log = LoggerFactory.getLogger(DockerManager.class); + private static final Logger log = LoggerFactory.getLogger(LocalDockerManager.class); private DockerClient dockerClient; - public DockerManager() { + public LocalDockerManager() { DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); this.dockerClient = DockerClientBuilder.getInstance(config).build(); }