openvidu-server: CDR recordingStopped event on recordingStatusChanged…

… (stopped)
syedMSohaib · Jul 15, 2019 · a89b12d · a89b12d
1 parent 705119d
commit a89b12d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 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
@@ -210,11 +210,8 @@ public void recordRecordingStopped(Recording recording, EndReason reason, long t
 				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/...u-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/...u-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java
@@ -392,7 +392,6 @@ private Recording stopRecordingAudioOnly(Session session, Recording recording, E
 						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
@@ -217,6 +217,7 @@ public Recording stopRecording(Session session, String recordingId, EndReason re
 
 		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/...rver/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java b/...rver/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java
@@ -177,7 +177,6 @@ public Recording stopRecording(Session session, Recording recording, EndReason r
 				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());