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

openvidu-server: media-server to media-node

pull/370/head
pabloFuente 2019-10-11 10:21:31 +02:00
parent 1d240d994c
commit 67de82ba20
6 changed files with 8 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/core/Session.java
View File

@ -118,7 +118,7 @@ public class Session implements SessionInterface {
return closed;
}
public String getMediaServerId() {
public String getMediaNodeId() {
return null;
}

2
openvidu-server/src/main/java/io/openvidu/server/core/SessionInterface.java
View File

@ -45,7 +45,7 @@ public interface SessionInterface {
int getActivePublishers();
String getMediaServerId();
String getMediaNodeId();
JsonObject toJson();

6
openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
View File

@ -483,7 +483,7 @@ public abstract class SessionManager {
recordingManager.stopRecording(session, null, RecordingManager.finalReason(reason));
}
final String mediaServerId = session.getMediaServerId();
final String mediaNodeId = session.getMediaNodeId();
if (session.close(reason)) {
sessionEventsHandler.onSessionClosed(session.getSessionId(), reason);
@ -493,8 +493,8 @@ public abstract class SessionManager {
log.info("Session '{}' removed and closed", session.getSessionId());
if (mediaServerId != null) {
this.quarantineKiller.dropMediaServer(mediaServerId);
if (mediaNodeId != null) {
this.quarantineKiller.dropMediaNode(mediaNodeId);
}
}

2
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
View File

@ -165,7 +165,7 @@ public class KurentoSession extends Session {
}
@Override
public String getMediaServerId() {
public String getMediaNodeId() {
return this.kms.getId();
}

2
openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java
View File

@ -2,6 +2,6 @@ package io.openvidu.server.utils;
public interface QuarantineKiller {
public void dropMediaServer(String mediaServerId);
public void dropMediaNode(String mediaNodeId);
}

2
openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java
View File

@ -3,7 +3,7 @@ package io.openvidu.server.utils;
public class QuarantineKillerDummy implements QuarantineKiller {
@Override
public void dropMediaServer(String mediaServerId) {
public void dropMediaNode(String mediaNodeId) {
}
}