diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java index 46ee0e2f..abf0b51d 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java @@ -36,10 +36,14 @@ public class FixedOneKmsManager extends KmsManager { KurentoClient kClient = null; Kms kms = new Kms(firstProps, loadManager); try { - kClient = KurentoClient.create(firstProps.getUri(), - this.generateKurentoConnectionListener(kms.getId(), false)); + kClient = KurentoClient.create(firstProps.getUri(), this.generateKurentoConnectionListener(kms.getId())); this.addKms(kms); kms.setKurentoClient(kClient); + + // TODO: This should be done in KurentoClient connected event + kms.setKurentoClientConnected(true); + kms.setTimeOfKurentoClientConnection(System.currentTimeMillis()); + } catch (KurentoException e) { log.error("KMS in {} is not reachable by OpenVidu Server", firstProps.getUri()); if (kClient != null) { diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java index 12c140df..a7aff91f 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java @@ -141,8 +141,7 @@ public abstract class KmsManager { return kmsLoads; } - protected KurentoConnectionListener generateKurentoConnectionListener(final String kmsId, - final boolean sendConnectedEvent) { + protected KurentoConnectionListener generateKurentoConnectionListener(final String kmsId) { return new KurentoConnectionListener() { @Override @@ -184,9 +183,8 @@ public abstract class KmsManager { @Override public void connected() { final Kms kms = kmss.get(kmsId); - kms.setKurentoClientConnected(true); - kms.setTimeOfKurentoClientConnection(System.currentTimeMillis()); - mediaNodeStatusManager.setStatus(kmsId, kms.getUri(), "running", sendConnectedEvent); + // kms.setKurentoClientConnected(true); + // kms.setTimeOfKurentoClientConnection(System.currentTimeMillis()); log.warn("Kurento Client is now connected to KMS {} with uri {}", kmsId, kms.getUri()); } }; diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManager.java index 674da7dd..03e7c3eb 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManager.java @@ -10,6 +10,4 @@ public interface MediaNodeStatusManager { public boolean isWaitingIdleToTerminate(String mediaNodeId); - public void setStatus(String mediaNodeId, String uri, String status, boolean sendConnectedEvent); - } diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java index 050ee283..d832e65e 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java @@ -22,8 +22,4 @@ public class MediaNodeStatusManagerDummy implements MediaNodeStatusManager { return false; } - @Override - public void setStatus(String mediaNodeId, String uri, String status, boolean sendConnectedEvent) { - } - }