openvidu-server: close sessions before closing KurentoClients on PreD…

…estroy
GGTY81 · May 20, 2021 · e2b6963 · e2b6963
1 parent 0117e7e
commit e2b6963
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
@@ -31,6 +31,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.PreDestroy;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.kurento.client.GenericMediaElement;
 import org.kurento.client.IceCandidate;
@@ -1444,4 +1446,11 @@ protected Kms selectMediaNode(Session session) throws OpenViduException {
 		return lessLoadedKms;
 	}
 
+	@PreDestroy
+	@Override
+	public void close() {
+		super.close();
+		this.kmsManager.closeAllKurentoClients();
+	}
+
 }
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
@@ -31,7 +31,6 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.kurento.jsonrpc.client.JsonRpcWSConnectionListener;
@@ -343,8 +342,7 @@ public abstract void decrementActiveRecordings(RecordingProperties recordingProp
 	@PostConstruct
 	protected abstract void postConstructInitKurentoClients();
 
-	@PreDestroy
-	public void close() {
+	public void closeAllKurentoClients() {
 		log.info("Closing all KurentoClients");
 		this.kmss.values().forEach(kms -> {
 			if (kms.getKurentoClientReconnectTimer() != null) {