From 67de82ba20583a35ba5ebde81f86f2382083df2c Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 11 Oct 2019 10:21:31 +0200 Subject: [PATCH] openvidu-server: media-server to media-node --- .../src/main/java/io/openvidu/server/core/Session.java | 2 +- .../main/java/io/openvidu/server/core/SessionInterface.java | 2 +- .../main/java/io/openvidu/server/core/SessionManager.java | 6 +++--- .../io/openvidu/server/kurento/core/KurentoSession.java | 2 +- .../java/io/openvidu/server/utils/QuarantineKiller.java | 2 +- .../io/openvidu/server/utils/QuarantineKillerDummy.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java index 05da0587..24173bd5 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Session.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Session.java @@ -118,7 +118,7 @@ public class Session implements SessionInterface { return closed; } - public String getMediaServerId() { + public String getMediaNodeId() { return null; } diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionInterface.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionInterface.java index cb409578..6645f866 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionInterface.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionInterface.java @@ -45,7 +45,7 @@ public interface SessionInterface { int getActivePublishers(); - String getMediaServerId(); + String getMediaNodeId(); JsonObject toJson(); diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java index 41b16af2..1432f067 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java @@ -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); } } diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java index 4d261366..7b24f7e9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java @@ -165,7 +165,7 @@ public class KurentoSession extends Session { } @Override - public String getMediaServerId() { + public String getMediaNodeId() { return this.kms.getId(); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java b/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java index c88b300f..a757514b 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java @@ -2,6 +2,6 @@ package io.openvidu.server.utils; public interface QuarantineKiller { - public void dropMediaServer(String mediaServerId); + public void dropMediaNode(String mediaNodeId); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java b/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java index 8a10475b..8bfad9a5 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java @@ -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) { } }