From 7670711f46550fe563a322026a0f4941a5fdffec Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 9 Jul 2019 09:40:40 +0200
Subject: [PATCH] openvidu-server: fix KurentoClient association to Kms
 instances

---
 .../kurento/kms/FixedOneKmsManager.java       | 10 ++--
 .../io/openvidu/server/kurento/kms/Kms.java   | 48 +++++++++++--------
 2 files changed, 33 insertions(+), 25 deletions(-)

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 0ffb8d39..5adba598 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
@@ -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);
 	}
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 ef192869..a403317b 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
@@ -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);
 			}
 		}