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

openvidu-server: fix KurentoClient association to Kms instances

pull/375/head
pabloFuente 2019-07-09 09:40:40 +02:00
parent 85a3dda3a1
commit 7670711f46
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,16 +29,16 @@ public class FixedOneKmsManager extends KmsManager {
public List<Kms> initializeKurentoClients(List<String> kmsUris) throws Exception {
final String kmsUri = kmsUris.get(0);
KurentoClient kClient = null;
Kms kms = new Kms(kmsUri, loadManager);
this.addKms(kms);
try {
kClient = KurentoClient.create(kmsUri, this.generateKurentoConnectionListener(kmsUri));
kClient = KurentoClient.create(kmsUri, this.generateKurentoConnectionListener(kms.getId()));
} catch (KurentoException e) {
log.error("KMS in {} is not reachable by OpenVidu Server", kmsUri);
throw new Exception();
}
Kms kms = new Kms(kmsUri, kClient, loadManager);
kms.setKurentoClientConnected(true);
kms.setTimeOfKurentoClientConnection(System.currentTimeMillis());
this.addKms(kms);
kms.setKurentoClient(kClient);
return Arrays.asList(kms);
}

48
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java
View File

@ -64,7 +64,7 @@ public class Kms {
private Map<String, KurentoSession> kurentoSessions = new ConcurrentHashMap<>();
public Kms(String uri, KurentoClient client, LoadManager loadManager) {
public Kms(String uri, LoadManager loadManager) {
this.uri = uri;
this.id = "KMS-" + RandomStringUtils.randomAlphanumeric(6).toUpperCase();
@ -75,11 +75,13 @@ public class Kms {
} catch (MalformedURLException e) {
log.error("KMS uri {} is not a valid WebSocket endpoint", uri);
}
this.client = client;
this.loadManager = loadManager;
}
public void setKurentoClient(KurentoClient client) {
this.client = client;
}
public String getId() {
return id;
}
@ -173,26 +175,32 @@ public class Kms {
JsonObject kurentoExtraInfo = new JsonObject();
kurentoExtraInfo.addProperty("memory", this.client.getServerManager().getUsedMemory() / 1024);
try {
ServerInfo info = this.client.getServerManager().getInfo();
kurentoExtraInfo.addProperty("version", info.getVersion());
kurentoExtraInfo.addProperty("capabilities", info.getCapabilities().toString());
kurentoExtraInfo.addProperty("memory", this.client.getServerManager().getUsedMemory() / 1024);
JsonArray modules = new JsonArray();
for (ModuleInfo moduleInfo : info.getModules()) {
JsonObject moduleJson = new JsonObject();
moduleJson.addProperty("name", moduleInfo.getName());
moduleJson.addProperty("version", moduleInfo.getVersion());
moduleJson.addProperty("generationTime", moduleInfo.getGenerationTime());
JsonArray factories = new JsonArray();
moduleInfo.getFactories().forEach(fact -> factories.add(fact));
moduleJson.add("factories", factories);
modules.add(moduleJson);
ServerInfo info = this.client.getServerManager().getInfo();
kurentoExtraInfo.addProperty("version", info.getVersion());
kurentoExtraInfo.addProperty("capabilities", info.getCapabilities().toString());
JsonArray modules = new JsonArray();
for (ModuleInfo moduleInfo : info.getModules()) {
JsonObject moduleJson = new JsonObject();
moduleJson.addProperty("name", moduleInfo.getName());
moduleJson.addProperty("version", moduleInfo.getVersion());
moduleJson.addProperty("generationTime", moduleInfo.getGenerationTime());
JsonArray factories = new JsonArray();
moduleInfo.getFactories().forEach(fact -> factories.add(fact));
moduleJson.add("factories", factories);
modules.add(moduleJson);
}
kurentoExtraInfo.add("modules", modules);
json.add("kurentoInfo", kurentoExtraInfo);
} catch (Exception e) {
log.warn("KMS {} extra info was requested but there's no connection to it", this.id);
}
kurentoExtraInfo.add("modules", modules);
json.add("kurentoInfo", kurentoExtraInfo);
}
}