openvidu-server: Kms#fetchMediaServerType performed in single point

pull/707/head
pabloFuente 2022-03-21 14:44:38 +01:00
parent 9d975d3a17
commit 6f417a001f
3 changed files with 11 additions and 3 deletions

View File

@ -56,12 +56,11 @@ public class FixedOneKmsManager extends KmsManager {
// TODO: This should be done in KurentoClient connected event
kms.setKurentoClientConnected(true);
MediaServer mediaServer = kms.fetchMediaServerType();
this.addKms(kms);
// Set Media Server in OpenVidu configuration
this.openviduConfig.setMediaServer(mediaServer);
this.openviduConfig.setMediaServer(kms.getMediaServer());
} catch (KurentoException e) {
log.error("KMS in {} is not reachable by OpenVidu Server", firstProps.getUri());

View File

@ -147,6 +147,9 @@ public class Kms {
if (isConnected) {
this.setTimeOfKurentoClientConnection(timestamp);
this.mediaNodeManager.mediaNodeUsageRegistration(this, timestamp);
if (this.mediaServer == null) {
this.fetchMediaServerType();
}
} else {
this.setTimeOfKurentoClientDisconnection(timestamp);
this.mediaNodeManager.mediaNodeUsageDeregistration(this, timestamp);
@ -298,6 +301,13 @@ public class Kms {
return this.activeComposedRecordings.intValue();
}
public MediaServer getMediaServer() {
if (this.mediaServer == null) {
this.fetchMediaServerType();
}
return this.mediaServer;
}
public MediaServer fetchMediaServerType() {
ServerInfo serverInfo = this.client.getServerManager().getInfo();
if (serverInfo.getVersion().startsWith("openvidu/mediasoup-controller")) {

View File

@ -62,7 +62,6 @@ public class IntegrationTestConfiguration {
kms.setKurentoClient(kClient);
kms.setKurentoClientConnected(true);
kms.fetchMediaServerType();
spy.addKms(kms);
successfullyConnectedKmss.add(kms);