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

openvidu-server: DockerManager interface

pull/559/head
pabloFuente 2020-11-18 13:09:56 +01:00
parent 51d224b40b
commit 1fab774397
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ import io.openvidu.server.recording.RecordingDownloader;
import io.openvidu.server.recording.RecordingInfoUtils; import io.openvidu.server.recording.RecordingInfoUtils;
import io.openvidu.server.recording.RecordingUploader; import io.openvidu.server.recording.RecordingUploader;
import io.openvidu.server.rest.RequestMappings; import io.openvidu.server.rest.RequestMappings;
import io.openvidu.server.utils.DockerManager; import io.openvidu.server.utils.LocalDockerManager;
import io.openvidu.server.utils.QuarantineKiller; import io.openvidu.server.utils.QuarantineKiller;
public class ComposedRecordingService extends RecordingService { public class ComposedRecordingService extends RecordingService {
@ -69,13 +69,13 @@ public class ComposedRecordingService extends RecordingService {
protected Map<String, String> sessionsContainers = new ConcurrentHashMap<>(); protected Map<String, String> sessionsContainers = new ConcurrentHashMap<>();
private Map<String, CompositeWrapper> composites = new ConcurrentHashMap<>(); private Map<String, CompositeWrapper> composites = new ConcurrentHashMap<>();
protected DockerManager dockerManager; protected LocalDockerManager dockerManager;
public ComposedRecordingService(RecordingManager recordingManager, RecordingDownloader recordingDownloader, public ComposedRecordingService(RecordingManager recordingManager, RecordingDownloader recordingDownloader,
RecordingUploader recordingUploader, OpenviduConfig openviduConfig, CallDetailRecord cdr, RecordingUploader recordingUploader, OpenviduConfig openviduConfig, CallDetailRecord cdr,
QuarantineKiller quarantineKiller) { QuarantineKiller quarantineKiller) {
super(recordingManager, recordingDownloader, recordingUploader, openviduConfig, cdr, quarantineKiller); super(recordingManager, recordingDownloader, recordingUploader, openviduConfig, cdr, quarantineKiller);
this.dockerManager = new DockerManager(); this.dockerManager = new LocalDockerManager();
} }
@Override @Override

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

@ -73,7 +73,7 @@ import io.openvidu.server.recording.Recording;
import io.openvidu.server.recording.RecordingDownloader; import io.openvidu.server.recording.RecordingDownloader;
import io.openvidu.server.recording.RecordingUploader; import io.openvidu.server.recording.RecordingUploader;
import io.openvidu.server.utils.CustomFileManager; 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.JsonUtils;
import io.openvidu.server.utils.QuarantineKiller; import io.openvidu.server.utils.QuarantineKiller;
import io.openvidu.server.utils.RecordingUtils; import io.openvidu.server.utils.RecordingUtils;
@ -85,7 +85,7 @@ public class RecordingManager {
private ComposedRecordingService composedRecordingService; private ComposedRecordingService composedRecordingService;
private ComposedQuickStartRecordingService composedQuickStartRecordingService; private ComposedQuickStartRecordingService composedQuickStartRecordingService;
private SingleStreamRecordingService singleStreamRecordingService; private SingleStreamRecordingService singleStreamRecordingService;
private DockerManager dockerManager; private LocalDockerManager dockerManager;
@Autowired @Autowired
protected SessionEventsHandler sessionHandler; protected SessionEventsHandler sessionHandler;
@ -164,7 +164,7 @@ public class RecordingManager {
RecordingManager.IMAGE_TAG = openviduConfig.getOpenViduRecordingVersion(); RecordingManager.IMAGE_TAG = openviduConfig.getOpenViduRecordingVersion();
this.dockerManager = new DockerManager(); this.dockerManager = new LocalDockerManager();
this.composedRecordingService = new ComposedRecordingService(this, recordingDownloader, recordingUploader, this.composedRecordingService = new ComposedRecordingService(this, recordingDownloader, recordingUploader,
openviduConfig, cdr, quarantineKiller); openviduConfig, cdr, quarantineKiller);
this.composedQuickStartRecordingService = new ComposedQuickStartRecordingService(this, recordingDownloader, this.composedQuickStartRecordingService = new ComposedQuickStartRecordingService(this, recordingDownloader,
@ -215,9 +215,9 @@ public class RecordingManager {
public void checkRecordingRequirements(String openviduRecordingPath, String openviduRecordingCustomLayout) public void checkRecordingRequirements(String openviduRecordingPath, String openviduRecordingCustomLayout)
throws OpenViduException { throws OpenViduException {
DockerManager dockerManager = null; LocalDockerManager dockerManager = null;
try { try {
dockerManager = new DockerManager(); dockerManager = new LocalDockerManager();
dockerManager.checkDockerEnabled(); dockerManager.checkDockerEnabled();
} catch (OpenViduException e) { } catch (OpenViduException e) {
String message = e.getMessage(); String message = e.getMessage();

6
openvidu-server/src/main/java/io/openvidu/server/utils/DockerManager.java → openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java
View File

@ -53,13 +53,13 @@ import io.openvidu.client.OpenViduException;
import io.openvidu.client.OpenViduException.Code; import io.openvidu.client.OpenViduException.Code;
import io.openvidu.server.recording.service.WaitForContainerStoppedCallback; 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; private DockerClient dockerClient;
public DockerManager() { public LocalDockerManager() {
DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
this.dockerClient = DockerClientBuilder.getInstance(config).build(); this.dockerClient = DockerClientBuilder.getInstance(config).build();
} }