From c6adaa2688ee14e542743802021f6c4ee111b4e2 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 3 Dec 2019 15:36:31 +0100 Subject: [PATCH] openvidu-server: some WARN level logging to INFO level --- .../kurento/core/KurentoParticipant.java | 4 +++- .../kurento/core/KurentoSessionManager.java | 6 ++++-- .../server/kurento/kms/KmsManager.java | 20 ++++++++----------- .../recording/service/RecordingManager.java | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipant.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipant.java index 6d018242..bbe2afb6 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipant.java @@ -331,7 +331,9 @@ public class KurentoParticipant extends Participant { this.getParticipantPublicId(), remoteParticipantName); } } - releasePublisherEndpoint(reason, kmsDisconnectionTime); + if (publisher != null && publisher.getEndpoint() != null) { + releasePublisherEndpoint(reason, kmsDisconnectionTime); + } } /** 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 index 9dfac0fe..6e1c3bd1 100644 --- 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 @@ -515,7 +515,8 @@ public class KurentoSessionManager extends SessionManager { // Also associate the KurentoSession with the Kms kms.addKurentoSession(session); - log.warn("No session '{}' exists yet. Created one on KMS '{}'", session.getSessionId(), kms.getUri()); + log.info("No session '{}' exists yet. Created one on KMS '{}' with ip '{}'", session.getSessionId(), + kms.getId(), kms.getIp()); sessionEventsHandler.onSessionCreated(session); return session; @@ -847,7 +848,8 @@ public class KurentoSessionManager extends SessionManager { } @Override - public Participant publishIpcam(Session session, MediaOptions mediaOptions, String serverMetadata) throws Exception { + public Participant publishIpcam(Session session, MediaOptions mediaOptions, String serverMetadata) + throws Exception { final String sessionId = session.getSessionId(); final KurentoMediaOptions kMediaOptions = (KurentoMediaOptions) mediaOptions; 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 index a7aff91f..237a6478 100644 --- 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 @@ -98,22 +98,20 @@ public abstract class KmsManager { return this.kmss.remove(kmsId); } - public synchronized Kms getLessLoadedKms() throws NoSuchElementException { - return Collections.min(getKmsLoads()).kms; - } - public synchronized Kms getLessLoadedAndRunningKms() throws NoSuchElementException { List kmsLoads = getKmsLoads().stream() .filter(kmsLoad -> mediaNodeStatusManager.isRunning(kmsLoad.kms.getId())).collect(Collectors.toList()); return Collections.min(kmsLoads).kms; } - public Kms getKms(String kmsId) { - return this.kmss.get(kmsId); + public synchronized List getKmssSortedByLoad() { + List kmsLoads = getKmsLoads(); + Collections.sort(kmsLoads); + return kmsLoads; } - public boolean kmsWithUriExists(String kmsUri) { - return this.kmss.values().stream().anyMatch(kms -> kms.getUri().equals(kmsUri)); + public Kms getKms(String kmsId) { + return this.kmss.get(kmsId); } public KmsLoad getKmsLoad(String kmsId) { @@ -125,10 +123,8 @@ public abstract class KmsManager { return this.kmss.values(); } - public synchronized List getKmssSortedByLoad() { - List kmsLoads = getKmsLoads(); - Collections.sort(kmsLoads); - return kmsLoads; + public boolean kmsWithUriExists(String kmsUri) { + return this.kmss.values().stream().anyMatch(kms -> kms.getUri().equals(kmsUri)); } private List getKmsLoads() { diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java index 1ef294fa..bccd1996 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java @@ -603,7 +603,7 @@ public class RecordingManager { log.warn("No KMSs were defined in kms.uris array. Recording path check aborted"); } else { - MediaPipeline pipeline = this.kmsManager.getLessLoadedKms().getKurentoClient().createMediaPipeline(); + MediaPipeline pipeline = this.kmsManager.getLessLoadedAndRunningKms().getKurentoClient().createMediaPipeline(); RecorderEndpoint recorder = new RecorderEndpoint.Builder(pipeline, "file://" + testFilePath).build(); final AtomicBoolean kurentoRecorderError = new AtomicBoolean(false);