ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: CDR recordingStopped event now has reason property

pull/87/merge
pabloFuente 2018-07-13 12:47:15 +02:00
parent 248710591f
commit 062f43d4f4
7 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java
View File

@ -65,7 +65,7 @@ public class CDREvent implements Comparable<CDREvent> {
this.startTime = this.timeStamp; this.startTime = this.timeStamp;
} }
public CDREvent(CDREventName eventName, String sessionId, Recording recording) { public CDREvent(CDREventName eventName, String sessionId, Recording recording, String reason) {
this.eventName = eventName; this.eventName = eventName;
if ((sessionId.indexOf('/')) != -1) { if ((sessionId.indexOf('/')) != -1) {
this.sessionId = sessionId.substring(sessionId.lastIndexOf('/') + 1, sessionId.length()); this.sessionId = sessionId.substring(sessionId.lastIndexOf('/') + 1, sessionId.length());
@ -80,6 +80,7 @@ public class CDREvent implements Comparable<CDREvent> {
this.hasAudio = recording.hasAudio(); this.hasAudio = recording.hasAudio();
this.hasVideo = recording.hasVideo(); this.hasVideo = recording.hasVideo();
this.recordingLayout = recording.getRecordingLayout(); this.recordingLayout = recording.getRecordingLayout();
this.reason = reason;
} }
public CDREvent(CDREventName eventName, Participant participant, String sessionId) { public CDREvent(CDREventName eventName, Participant participant, String sessionId) {

20
openvidu-server/src/main/java/io/openvidu/server/cdr/CallDetailRecord.java
View File

@ -17,7 +17,9 @@
package io.openvidu.server.cdr; package io.openvidu.server.cdr;
import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -86,6 +88,8 @@ public class CallDetailRecord {
private Map<String, CDREvent> publications = new ConcurrentHashMap<>(); private Map<String, CDREvent> publications = new ConcurrentHashMap<>();
private Map<String, Set<CDREvent>> subscriptions = new ConcurrentHashMap<>(); private Map<String, Set<CDREvent>> subscriptions = new ConcurrentHashMap<>();
private final List<String> lastParticipantLeftReasons = Arrays.asList(new String[] {"disconnect", "forceDisconnectByUser", "forceDisconnectByServer", "networkDisconnect"});
public CallDetailRecord(CDRLogger logger) { public CallDetailRecord(CDRLogger logger) {
this.logger = logger; this.logger = logger;
} }
@ -98,7 +102,7 @@ public class CallDetailRecord {
public void recordSessionDestroyed(String sessionId, String reason) { public void recordSessionDestroyed(String sessionId, String reason) {
CDREvent e = this.sessions.remove(sessionId); CDREvent e = this.sessions.remove(sessionId);
if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.sessionDestroyed, e, reason)); if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.sessionDestroyed, e, this.finalReason(reason)));
} }
public void recordParticipantJoined(Participant participant, String sessionId) { public void recordParticipantJoined(Participant participant, String sessionId) {
@ -156,11 +160,19 @@ public class CallDetailRecord {
} }
public void recordRecordingStarted(String sessionId, Recording recording) { public void recordRecordingStarted(String sessionId, Recording recording) {
if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.recordingStarted, sessionId, recording)); if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.recordingStarted, sessionId, recording, null));
} }
public void recordRecordingStopped(String sessionId, Recording recording) { public void recordRecordingStopped(String sessionId, Recording recording, String reason) {
if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.recordingStopped, sessionId, recording)); if (openviduConfig.isCdrEnabled()) this.logger.log(new CDREvent(CDREventName.recordingStopped, sessionId, recording, this.finalReason(reason)));
}
private String finalReason(String reason) {
if (lastParticipantLeftReasons.contains(reason)) {
return "lastParticipantLeft";
} else {
return reason;
}
} }
} }

4
openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java
View File

@ -410,9 +410,9 @@ public class SessionEventsHandler {
} }
} }
public void sendRecordingStoppedNotification(Session session, Recording recording) { public void sendRecordingStoppedNotification(Session session, Recording recording, String reason) {
CDR.recordRecordingStopped(session.getSessionId(), recording); CDR.recordRecordingStopped(session.getSessionId(), recording, reason);
// Be sure to clean this map (this should return null) // Be sure to clean this map (this should return null)
this.recordingsStarted.remove(session.getSessionId()); this.recordingsStarted.remove(session.getSessionId());

2
openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
View File

@ -424,7 +424,7 @@ public abstract class SessionManager {
this.closeSessionAndEmptyCollections(session, reason); this.closeSessionAndEmptyCollections(session, reason);
if (recordingService.sessionIsBeingRecorded(session.getSessionId())) { if (recordingService.sessionIsBeingRecorded(session.getSessionId())) {
recordingService.stopRecording(session); recordingService.stopRecording(session, reason);
} }
return participants; return participants;

2
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -173,7 +173,7 @@ public class KurentoSessionManager extends SessionManager {
.equals(remainingParticipants.iterator().next().getParticipantPublicId())) { .equals(remainingParticipants.iterator().next().getParticipantPublicId())) {
log.info("Last participant left. Stopping recording for session {}", sessionId); log.info("Last participant left. Stopping recording for session {}", sessionId);
recordingService.stopRecording(session); recordingService.stopRecording(session, reason);
evictParticipant(session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, evictParticipant(session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null,
null, "EVICT_RECORDER"); null, "EVICT_RECORDER");
} }

4
openvidu-server/src/main/java/io/openvidu/server/recording/ComposedRecordingService.java
View File

@ -156,7 +156,7 @@ public class ComposedRecordingService {
return recording; return recording;
} }
public Recording stopRecording(Session session) { public Recording stopRecording(Session session, String reason) {
Recording recording = this.sessionsRecordings.remove(session.getSessionId()); Recording recording = this.sessionsRecordings.remove(session.getSessionId());
String containerId = this.sessionsContainers.remove(session.getSessionId()); String containerId = this.sessionsContainers.remove(session.getSessionId());
this.startedRecordings.remove(recording.getId()); this.startedRecordings.remove(recording.getId());
@ -217,7 +217,7 @@ public class ComposedRecordingService {
"There was an error generating the metadata report file for the recording"); "There was an error generating the metadata report file for the recording");
} }
this.sessionHandler.sendRecordingStoppedNotification(session, recording); this.sessionHandler.sendRecordingStoppedNotification(session, recording, reason);
return recording; return recording;
} }

2
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -329,7 +329,7 @@ public class SessionRestController {
Session session = sessionManager.getSession(recording.getSessionId()); Session session = sessionManager.getSession(recording.getSessionId());
Recording stoppedRecording = this.recordingService.stopRecording(session); Recording stoppedRecording = this.recordingService.stopRecording(session, "recordingStoppedByServer");
sessionManager.evictParticipant( sessionManager.evictParticipant(
session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, null, session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, null,