From f70053c2f35b079e8145e4e76f734283797b959a Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 28 Mar 2022 12:39:26 +0200 Subject: [PATCH] openvidu-server: add nodeRecovered flag to mediaNodeUsageRegistration method --- .../src/main/java/io/openvidu/server/kurento/kms/Kms.java | 7 +++---- .../java/io/openvidu/server/utils/MediaNodeManager.java | 2 +- .../io/openvidu/server/utils/MediaNodeManagerDummy.java | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java index 2f0f198d..c02051bc 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java @@ -140,16 +140,15 @@ public class Kms { return this.isKurentoClientConnected.get(); } - public void setKurentoClientConnected(boolean isConnected, boolean reconnection) { + public void setKurentoClientConnected(boolean isConnected, boolean nodeRecovered) { final long timestamp = System.currentTimeMillis(); this.isKurentoClientConnected.set(isConnected); if (isConnected) { this.setTimeOfKurentoClientConnection(timestamp); this.setTimeOfKurentoClientDisconnection(0); this.setHasTriggeredNodeCrashedEvent(false); - if (!reconnection) { - kmsManager.getMediaNodeManager().mediaNodeUsageRegistration(this, timestamp, kmsManager.getKmss()); - } + kmsManager.getMediaNodeManager().mediaNodeUsageRegistration(this, timestamp, kmsManager.getKmss(), + nodeRecovered); if (this.mediaServer == null) { this.fetchMediaServerType(); } diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManager.java index b4b6a909..bb0ccfb4 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManager.java @@ -6,7 +6,7 @@ import io.openvidu.server.kurento.kms.Kms; public interface MediaNodeManager { - public void mediaNodeUsageRegistration(Kms kms, long timeOfConnection, Collection existingKmss); + public void mediaNodeUsageRegistration(Kms kms, long timeOfConnection, Collection existingKmss, boolean nodeRecovered); public void mediaNodeUsageDeregistration(String mediaNodeId, long timeOfDisconnection); diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManagerDummy.java b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManagerDummy.java index be629f84..44807406 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManagerDummy.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeManagerDummy.java @@ -7,7 +7,8 @@ import io.openvidu.server.kurento.kms.Kms; public class MediaNodeManagerDummy implements MediaNodeManager { @Override - public void mediaNodeUsageRegistration(Kms kms, long timeOfConnection, Collection existingKmss) { + public void mediaNodeUsageRegistration(Kms kms, long timeOfConnection, Collection existingKmss, + boolean nodeRecovered) { } @Override