From a89b12d682bffd4d84ee1522be66758356f7835e Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 15 Jul 2019 14:26:08 +0200 Subject: [PATCH] openvidu-server: CDR recordingStopped event on recordingStatusChanged (stopped) --- .../main/java/io/openvidu/server/cdr/CallDetailRecord.java | 7 ++----- .../server/recording/service/ComposedRecordingService.java | 1 - .../server/recording/service/RecordingManager.java | 1 + .../recording/service/SingleStreamRecordingService.java | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java index 4a391118..f0f6ebad 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java @@ -210,11 +210,8 @@ public class CallDetailRecord { RecordingManager.finalReason(reason), timestamp); this.log(recordingStoppedEvent); - // FIXME: Summary: update ended recording if recordSessionDestroyed has not been - // already called - if (sessionManager.getAccumulatedRecordings(recording.getSessionId()) != null) { - sessionManager.getAccumulatedRecordings(recording.getSessionId()).add(recordingStoppedEvent); - } + // Summary: update ended recording + sessionManager.getAccumulatedRecordings(recording.getSessionId()).add(recordingStoppedEvent); } public void recordRecordingStatusChanged(Recording recording, EndReason finalReason, long timestamp, diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java index 85979c39..160c1c68 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java @@ -392,7 +392,6 @@ public class ComposedRecordingService extends RecordingService { filesPath + RecordingManager.RECORDING_ENTITY_FILE + finalRecordingArray[0].getId()); final long timestamp = System.currentTimeMillis(); - cdr.recordRecordingStopped(finalRecordingArray[0], reason, timestamp); cdr.recordRecordingStatusChanged(finalRecordingArray[0], reason, timestamp, finalRecordingArray[0].getStatus()); }); 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 15968dec..faf2558b 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 @@ -217,6 +217,7 @@ public class RecordingManager { final long timestamp = System.currentTimeMillis(); this.cdr.recordRecordingStatusChanged(recording, reason, timestamp, Status.stopped); + cdr.recordRecordingStopped(recording, reason, timestamp); switch (recording.getOutputMode()) { case COMPOSED: diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java index 9236003b..0a973dc9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java @@ -177,7 +177,6 @@ public class SingleStreamRecordingService extends RecordingService { finalRecordingArray[0] = this.sealMetadataFiles(finalRecordingArray[0]); final long timestamp = System.currentTimeMillis(); - cdr.recordRecordingStopped(finalRecordingArray[0], reason, timestamp); cdr.recordRecordingStatusChanged(finalRecordingArray[0], reason, timestamp, finalRecordingArray[0].getStatus());