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

openvidu-server: remove RecordingManager.IMAGE_TAG (use OpenviduConfig instead)

pull/574/head
pabloFuente 2020-11-30 13:55:55 +01:00
parent 5d479dc645
commit 3d93fa6109
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java
View File

@ -220,7 +220,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService
String containerId = null; String containerId = null;
try { try {
final String container = RecordingManager.IMAGE_NAME + ":" + RecordingManager.IMAGE_TAG; final String container = RecordingManager.IMAGE_NAME + ":" + openviduConfig.getOpenViduRecordingVersion();
final String containerName = "recording_" + session.getSessionId(); final String containerName = "recording_" + session.getSessionId();
Volume volume1 = new Volume("/recordings"); Volume volume1 = new Volume("/recordings");
List<Volume> volumes = new ArrayList<>(); List<Volume> volumes = new ArrayList<>();

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

@ -166,7 +166,7 @@ public class ComposedRecordingService extends RecordingService {
String containerId; String containerId;
try { try {
final String container = RecordingManager.IMAGE_NAME + ":" + RecordingManager.IMAGE_TAG; final String container = RecordingManager.IMAGE_NAME + ":" + openviduConfig.getOpenViduRecordingVersion();
final String containerName = "recording_" + recording.getId(); final String containerName = "recording_" + recording.getId();
Volume volume1 = new Volume("/recordings"); Volume volume1 = new Volume("/recordings");
List<Volume> volumes = new ArrayList<>(); List<Volume> volumes = new ArrayList<>();

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

@ -126,7 +126,6 @@ public class RecordingManager {
Runtime.getRuntime().availableProcessors()); Runtime.getRuntime().availableProcessors());
public static final String IMAGE_NAME = "openvidu/openvidu-recording"; public static final String IMAGE_NAME = "openvidu/openvidu-recording";
public static String IMAGE_TAG;
private static final List<EndReason> LAST_PARTICIPANT_LEFT_REASONS = Arrays private static final List<EndReason> LAST_PARTICIPANT_LEFT_REASONS = Arrays
.asList(new EndReason[] { EndReason.disconnect, EndReason.forceDisconnectByUser, .asList(new EndReason[] { EndReason.disconnect, EndReason.forceDisconnectByUser,
@ -166,8 +165,6 @@ public class RecordingManager {
public void initializeRecordingManager() throws OpenViduException { public void initializeRecordingManager() throws OpenViduException {
RecordingManager.IMAGE_TAG = openviduConfig.getOpenViduRecordingVersion();
this.dockerManager.init(); this.dockerManager.init();
this.composedRecordingService = new ComposedRecordingService(this, recordingDownloader, recordingUploader, this.composedRecordingService = new ComposedRecordingService(this, recordingDownloader, recordingUploader,
@ -223,7 +220,7 @@ public class RecordingManager {
log.info("Recording module required: Downloading openvidu/openvidu-recording:" log.info("Recording module required: Downloading openvidu/openvidu-recording:"
+ openviduConfig.getOpenViduRecordingVersion() + " Docker image (350MB aprox)"); + openviduConfig.getOpenViduRecordingVersion() + " Docker image (350MB aprox)");
if (dockMng.dockerImageExistsLocally(IMAGE_NAME + ":" + IMAGE_TAG)) { if (dockMng.dockerImageExistsLocally(IMAGE_NAME + ":" + openviduConfig.getOpenViduRecordingVersion())) {
log.info("Docker image already exists locally"); log.info("Docker image already exists locally");
} else { } else {
Thread t = new Thread(() -> { Thread t = new Thread(() -> {
@ -241,9 +238,10 @@ public class RecordingManager {
}); });
t.start(); t.start();
try { try {
dockMng.downloadDockerImage(IMAGE_NAME + ":" + IMAGE_TAG, 600); dockMng.downloadDockerImage(IMAGE_NAME + ":" + openviduConfig.getOpenViduRecordingVersion(), 600);
} catch (Exception e) { } catch (Exception e) {
log.error("Error downloading docker image {}:{}", IMAGE_NAME, IMAGE_TAG); log.error("Error downloading docker image {}:{}", IMAGE_NAME,
openviduConfig.getOpenViduRecordingVersion());
} }
t.interrupt(); t.interrupt();
try { try {