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

openvidu-server: ignore KurentoClient connected event (use sync create method)

pull/370/head
pabloFuente 2019-10-25 11:45:48 +02:00
parent 00484937bd
commit 7507569c9f
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java
View File

@ -36,10 +36,14 @@ public class FixedOneKmsManager extends KmsManager {
KurentoClient kClient = null; KurentoClient kClient = null;
Kms kms = new Kms(firstProps, loadManager); Kms kms = new Kms(firstProps, loadManager);
try { try {
kClient = KurentoClient.create(firstProps.getUri(), kClient = KurentoClient.create(firstProps.getUri(), this.generateKurentoConnectionListener(kms.getId()));
this.generateKurentoConnectionListener(kms.getId(), false));
this.addKms(kms); this.addKms(kms);
kms.setKurentoClient(kClient); kms.setKurentoClient(kClient);
// TODO: This should be done in KurentoClient connected event
kms.setKurentoClientConnected(true);
kms.setTimeOfKurentoClientConnection(System.currentTimeMillis());
} catch (KurentoException e) { } catch (KurentoException e) {
log.error("KMS in {} is not reachable by OpenVidu Server", firstProps.getUri()); log.error("KMS in {} is not reachable by OpenVidu Server", firstProps.getUri());
if (kClient != null) { if (kClient != null) {

8
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
View File

@ -141,8 +141,7 @@ public abstract class KmsManager {
return kmsLoads; return kmsLoads;
} }
protected KurentoConnectionListener generateKurentoConnectionListener(final String kmsId, protected KurentoConnectionListener generateKurentoConnectionListener(final String kmsId) {
final boolean sendConnectedEvent) {
return new KurentoConnectionListener() { return new KurentoConnectionListener() {
@Override @Override
@ -184,9 +183,8 @@ public abstract class KmsManager {
@Override @Override
public void connected() { public void connected() {
final Kms kms = kmss.get(kmsId); final Kms kms = kmss.get(kmsId);
kms.setKurentoClientConnected(true); // kms.setKurentoClientConnected(true);
kms.setTimeOfKurentoClientConnection(System.currentTimeMillis()); // kms.setTimeOfKurentoClientConnection(System.currentTimeMillis());
mediaNodeStatusManager.setStatus(kmsId, kms.getUri(), "running", sendConnectedEvent);
log.warn("Kurento Client is now connected to KMS {} with uri {}", kmsId, kms.getUri()); log.warn("Kurento Client is now connected to KMS {} with uri {}", kmsId, kms.getUri());
} }
}; };

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

@ -10,6 +10,4 @@ public interface MediaNodeStatusManager {
public boolean isWaitingIdleToTerminate(String mediaNodeId); public boolean isWaitingIdleToTerminate(String mediaNodeId);
public void setStatus(String mediaNodeId, String uri, String status, boolean sendConnectedEvent);
} }

4
openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java
View File

@ -22,8 +22,4 @@ public class MediaNodeStatusManagerDummy implements MediaNodeStatusManager {
return false; return false;
} }
@Override
public void setStatus(String mediaNodeId, String uri, String status, boolean sendConnectedEvent) {
}
} }