diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecording.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecording.java index 80bb92bf..266f0d0a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecording.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecording.java @@ -56,6 +56,9 @@ public class CDREventRecording extends CDREventEnd { && this.recording.getCustomLayout() != null && !this.recording.getCustomLayout().isEmpty()) { json.addProperty("customLayout", this.recording.getCustomLayout()); } + if (this.recording.getRecordingProperties().mediaNode() != null) { + json.addProperty("media_node_id", this.recording.getRecordingProperties().mediaNode()); + } } json.addProperty("hasAudio", this.recording.hasAudio()); json.addProperty("hasVideo", this.recording.hasVideo()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecordingStatus.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecordingStatus.java index e853da46..8d3b682b 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecordingStatus.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventRecordingStatus.java @@ -51,6 +51,9 @@ public class CDREventRecordingStatus extends CDREventEnd { && this.recording.getCustomLayout() != null && !this.recording.getCustomLayout().isEmpty()) { json.addProperty("customLayout", this.recording.getCustomLayout()); } + if (this.recording.getRecordingProperties().mediaNode() != null) { + json.addProperty("media_node_id", this.recording.getRecordingProperties().mediaNode()); + } } json.addProperty("hasAudio", this.recording.hasAudio()); json.addProperty("hasVideo", this.recording.hasVideo()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java index d15dedf7..bda2c3cd 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java @@ -208,6 +208,9 @@ public class Recording { if (withUniqueSessionId) { json.addProperty("uniqueSessionId", this.uniqueSessionId); } + if (this.recordingProperties.mediaNode() != null) { + json.addProperty("mediaNode", this.recordingProperties.mediaNode()); + } json.addProperty("createdAt", this.createdAt); json.addProperty("size", this.size); json.addProperty("duration", this.duration); 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 20faad49..9b7cf59e 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 @@ -299,9 +299,10 @@ public class RecordingManager { } this.recordingFromStartingToStarted(recording); - this.cdr.recordRecordingStarted(recording); this.cdr.recordRecordingStatusChanged(recording, null, recording.getCreatedAt(), Status.started); + // TODO: remove deprecated "recordingStarted" event + this.cdr.recordRecordingStarted(recording); if (!(OutputMode.COMPOSED.equals(properties.outputMode()) && properties.hasVideo())) { // Directly send recording started notification for all cases except for @@ -363,7 +364,8 @@ public class RecordingManager { final long timestamp = System.currentTimeMillis(); this.cdr.recordRecordingStatusChanged(recording, reason, timestamp, Status.stopped); - cdr.recordRecordingStopped(recording, reason, timestamp); + // TODO: remove deprecated "recordingStopped" event + this.cdr.recordRecordingStopped(recording, reason, timestamp); switch (recording.getOutputMode()) { case COMPOSED: