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

CDR extended (session, participant and webrtc events)

pull/30/head
pabloFuente 2018-01-16 11:02:45 +01:00
parent 33e4009545
commit 7ce9ceb530
12 changed files with 264 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openvidu-server/pom.xml
View File

@ -106,10 +106,6 @@
<artifactId>kurento-jsonrpc-server</artifactId>
<version>${version.kurento}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
@ -201,9 +197,9 @@
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<version>${version.spring-boot}</version>
</dependency>
<!-- Test dependencies -->

122
openvidu-server/src/main/java/io/openvidu/server/cdr/CDREvent.java Normal file
View File

@ -0,0 +1,122 @@
package io.openvidu.server.cdr;
import org.json.simple.JSONObject;
import io.openvidu.server.core.MediaOptions;
import io.openvidu.server.core.Participant;
public class CDREvent implements Comparable<CDREvent> {
static final String SESSION_CREATED = "sessionCreated";
static final String SESSION_DESTROYED = "sessionDestroyed";
static final String PARTICIPANT_JOINED = "participantJoined";
static final String PARTICIPANT_LEFT = "participantLeft";
static final String CONNECTION_CREATED = "webrtcConnectionCreated";
static final String CONNECTION_DESTROYED = "webrtcConnectionDestroyed";
protected String eventName;
protected String sessionId;
private Participant participant;
private MediaOptions mediaOptions;
private String receivingFrom;
private Long startTime;
private Integer duration;
protected Long timeStamp;
public CDREvent(String eventName, CDREvent event) {
this(eventName, event.participant, event.sessionId, event.mediaOptions, event.receivingFrom, event.startTime);
this.duration = (int) (this.timeStamp - this.startTime / 1000);
}
public CDREvent(String eventName, String sessionId) {
this.eventName = eventName;
if ((sessionId.indexOf('/')) != -1) {
this.sessionId = sessionId.substring(sessionId.lastIndexOf('/') + 1, sessionId.length());
} else {
this.sessionId = sessionId;
}
this.timeStamp = System.currentTimeMillis();
this.startTime = this.timeStamp;
}
public CDREvent(String eventName, Participant participant, String sessionId) {
this(eventName, sessionId);
this.participant = participant;
this.startTime = this.timeStamp;
}
public CDREvent(String eventName, Participant participant, String sessionId, MediaOptions mediaOptions,
String receivingFrom, Long startTime) {
this(eventName, sessionId);
this.participant = participant;
this.mediaOptions = mediaOptions;
this.receivingFrom = receivingFrom;
this.startTime = startTime;
}
public MediaOptions getMediaOptions() {
return mediaOptions;
}
public String getParticipantPublicId() {
return this.participant.getParticipantPublicId();
}
public String getReceivingFrom() {
return this.receivingFrom;
}
@Override
@SuppressWarnings("unchecked")
public String toString() {
JSONObject json = new JSONObject();
json.put("sessionId", this.sessionId);
json.put("timestamp", this.timeStamp);
if (this.participant != null) {
json.put("participantId", this.participant.getParticipantPublicId());
}
if (this.mediaOptions != null) {
json.put("connection", this.receivingFrom != null ? "INBOUND" : "OUTBOUND");
json.put("audioEnabled", this.mediaOptions.audioActive);
json.put("videoEnabled", this.mediaOptions.videoActive);
if (this.mediaOptions.videoActive) {
json.put("videoSource", this.mediaOptions.typeOfVideo);
}
if (this.receivingFrom != null) {
json.put("receivingFrom", this.receivingFrom);
}
}
if (this.duration != null) {
json.put("startTime", this.startTime);
json.put("endTime", this.timeStamp);
json.put("duration", (this.timeStamp - this.startTime) / 1000);
}
JSONObject root = new JSONObject();
root.put(this.eventName, json);
return root.toString();
}
@Override
public int compareTo(CDREvent other) {
if (this.participant.equals(other.participant)) {
if (this.receivingFrom != null && other.receivingFrom != null) {
if (this.receivingFrom.equals(other.receivingFrom)) {
return 0;
} else {
return 1;
}
} else {
if (this.receivingFrom == null && other.receivingFrom == null) {
return 0;
} else {
return 1;
}
}
}
return 1;
}
}

96
openvidu-server/src/main/java/io/openvidu/server/cdr/CDRTransmission.java
View File

@ -1,96 +0,0 @@
package io.openvidu.server.cdr;
import java.text.SimpleDateFormat;
import java.util.Date;
import io.openvidu.server.core.MediaOptions;
import io.openvidu.server.core.Participant;
public class CDRTransmission implements Comparable<CDRTransmission> {
private Participant participant;
private String sessionId;
private MediaOptions mediaOptions;
private Long timeOfStart;
private Long timeOfEnd;
private CDRTransmission receivingFrom;
private SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd yyyy, HH:mm:ss");
public CDRTransmission(Participant participant, String sessionId, MediaOptions mediaOptions, CDRTransmission receivingFrom) {
this.participant = participant;
this.sessionId = sessionId;
this.mediaOptions = mediaOptions;
this.receivingFrom = receivingFrom;
this.timeOfStart = System.currentTimeMillis();
}
public Participant getParticipant() {
return this.participant;
}
public String getSessionId() {
return this.sessionId;
}
public MediaOptions getMediaOptions() {
return this.mediaOptions;
}
public void endCall() {
this.timeOfEnd = System.currentTimeMillis();
}
public String getDateOfStart() {
return this.dateFormat.format(new Date(this.timeOfStart));
}
public String getDateOfEnd() {
return this.dateFormat.format(new Date(this.timeOfEnd));
}
public int totalCallDuration() {
return (int) ((this.timeOfEnd - this.timeOfStart) / 1000);
}
public boolean getAudioEnabled() {
return this.mediaOptions.audioActive;
}
public boolean getVideoEnabled() {
return this.mediaOptions.videoActive;
}
public String typeOfVideo() {
if (!this.mediaOptions.videoActive) {
return "VIDEO_NOT_ENABLED";
} else {
return this.mediaOptions.typeOfVideo;
}
}
public CDRTransmission getReceivingFrom() {
return this.receivingFrom;
}
@Override
public int compareTo(CDRTransmission other) {
if (this.participant.equals(other.participant)) {
if (this.receivingFrom != null && other.receivingFrom != null) {
if (this.receivingFrom.getParticipant().equals(other.receivingFrom.getParticipant())) {
return 0;
} else {
return 1;
}
} else {
if (this.receivingFrom == null && other.receivingFrom == null) {
return 0;
} else {
return 1;
}
}
}
return 1;
}
}

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

@ -31,42 +31,68 @@ import io.openvidu.server.core.Participant;
public class CallDetailRecord {
private Logger log = LoggerFactory.getLogger(CallDetailRecord.class);
private Map<String, CDRTransmission> publications = new ConcurrentHashMap<>();
private Map<String, Set<CDRTransmission>> subscriptions = new ConcurrentHashMap<>();
private Map<String, CDREvent> sessions = new ConcurrentHashMap<>();
private Map<String, CDREvent> participants = new ConcurrentHashMap<>();
private Map<String, CDREvent> publications = new ConcurrentHashMap<>();
private Map<String, Set<CDREvent>> subscriptions = new ConcurrentHashMap<>();
public void recordSessionCreated(String sessionId) {
CDREvent e = new CDREvent(CDREvent.SESSION_CREATED, sessionId);
this.sessions.put(sessionId, e);
log.info("{}", e);
}
public void recordSessionDestroyed(String sessionId) {
CDREvent e = this.sessions.remove(sessionId);
log.info("{}", new CDREvent(CDREvent.SESSION_DESTROYED, e));
}
public void recordParticipantJoined(Participant participant, String sessionId) {
CDREvent e = new CDREvent(CDREvent.PARTICIPANT_JOINED, participant, sessionId);
this.participants.put(participant.getParticipantPublicId(), e);
log.info("{}", e);
}
public void recordParticipantLeft(Participant participant, String sessionId) {
CDREvent e = this.participants.remove(participant.getParticipantPublicId());
log.info("{}", new CDREvent(CDREvent.PARTICIPANT_LEFT, e));
}
public void recordNewPublisher(Participant participant, String sessionId, MediaOptions mediaOptions) {
CDRTransmission publisher = new CDRTransmission(participant, sessionId, mediaOptions, null);
CDREvent publisher = new CDREvent(CDREvent.CONNECTION_CREATED, participant, sessionId, mediaOptions, null, System.currentTimeMillis());
this.publications.put(participant.getParticipantPublicId(), publisher);
log.info("{}", publisher);
}
public void recordNewSubscriber(Participant participant, String sessionId, String senderPublicId) {
CDRTransmission publisher = this.publications.get(senderPublicId);
CDRTransmission subscriber = new CDRTransmission(participant, sessionId, publisher.getMediaOptions(), publisher);
CDREvent publisher = this.publications.get(senderPublicId);
CDREvent subscriber = new CDREvent(CDREvent.CONNECTION_CREATED, participant, sessionId, publisher.getMediaOptions(), publisher.getParticipantPublicId(), System.currentTimeMillis());
this.subscriptions.putIfAbsent(participant.getParticipantPublicId(), new ConcurrentSkipListSet<>());
this.subscriptions.get(participant.getParticipantPublicId()).add(subscriber);
log.info("{}", subscriber);
}
public boolean stopPublisher(String participantPublicId) {
CDRTransmission publisher = this.publications.remove(participantPublicId);
CDREvent publisher = this.publications.remove(participantPublicId);
if (publisher != null) {
publisher.endCall();
log.info("{}", getTransmissionMessage(publisher));
publisher = new CDREvent(CDREvent.CONNECTION_DESTROYED, publisher);
log.info("{}", publisher);
return true;
}
return false;
}
public boolean stopSubscriber(String participantPublicId, String senderPublicId) {
Set<CDRTransmission> participantSubscriptions = this.subscriptions.get(participantPublicId);
Set<CDREvent> participantSubscriptions = this.subscriptions.get(participantPublicId);
if (participantSubscriptions != null) {
CDRTransmission subscription;
for (Iterator<CDRTransmission> it = participantSubscriptions.iterator(); it.hasNext();) {
CDREvent subscription;
for (Iterator<CDREvent> it = participantSubscriptions.iterator(); it.hasNext();) {
subscription = it.next();
if (subscription.getReceivingFrom().getParticipant().getParticipantPublicId().equals(senderPublicId)) {
if (subscription.getReceivingFrom().equals(senderPublicId)) {
it.remove();
subscription.endCall();
log.info("{}", getTransmissionMessage(subscription));
subscription = new CDREvent(CDREvent.CONNECTION_DESTROYED, subscription);
log.info("{}", subscription);
return true;
}
}
@ -75,35 +101,16 @@ public class CallDetailRecord {
}
public void stopAllSubscriptions(String participantPublicId) {
Set<CDRTransmission> participantSubscriptions = this.subscriptions.get(participantPublicId);
Set<CDREvent> participantSubscriptions = this.subscriptions.get(participantPublicId);
if (participantSubscriptions != null) {
CDRTransmission subscription;
for (Iterator<CDRTransmission> it = participantSubscriptions.iterator(); it.hasNext();) {
CDREvent subscription;
for (Iterator<CDREvent> it = participantSubscriptions.iterator(); it.hasNext();) {
subscription = it.next();
subscription.endCall();
log.info("{}", getTransmissionMessage(subscription));
subscription = new CDREvent(CDREvent.CONNECTION_DESTROYED, subscription);
log.info("{}", subscription);
}
this.subscriptions.remove(participantPublicId).clear();
}
}
private String getTransmissionMessage(CDRTransmission cdr) {
StringBuffer sb = new StringBuffer();
sb.append("<participant>\n");
sb.append("\t<id>").append(cdr.getParticipant().getParticipantPublicId()).append("</id>\n");
sb.append("\t<session>").append(cdr.getSessionId()).append("</session>\n");
sb.append("\t<connection>").append((cdr.getReceivingFrom() != null) ? "INBOUND" : "OUTBOUND").append("</connection>\n");
if (cdr.getReceivingFrom() != null) sb.append("\t<from>").append((cdr.getReceivingFrom() != null)
? cdr.getReceivingFrom().getParticipant().getParticipantPublicId()
: "").append("</from>\n");
sb.append("\t<audio-enabled>").append(cdr.getAudioEnabled()).append("</audio-enabled>\n");
sb.append("\t<video-enabled>").append(cdr.getVideoEnabled()).append("</video-enabled>\n");
if (cdr.getVideoEnabled()) sb.append("\t<videosource>").append(cdr.typeOfVideo()).append("</videosource>\n");
sb.append("\t<start-time>").append(cdr.getDateOfStart()).append("</start-time>\n");
sb.append("\t<end-time>").append(cdr.getDateOfEnd()).append("</end-time>\n");
sb.append("\t<duration>").append(cdr.totalCallDuration()).append("</duration>\n");
sb.append("</participant>\n");
return sb.toString();
}
}

8
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -7,14 +7,14 @@ import org.springframework.stereotype.Component;
public class OpenviduConfig {
@Value("${openvidu.publicurl}")
private String openviduPublicUrl; //local, ngrok, docker, [FINAL_URL]
private String openviduPublicUrl; // local, ngrok, docker, [FINAL_URL]
@Value("${server.port}")
private String serverPort;
@Value("${openvidu.secret}")
private String openviduSecret;
@Value("${openvidu.cdr}")
private boolean openviduCdr;
@ -29,11 +29,11 @@ public class OpenviduConfig {
public String getOpenViduSecret() {
return this.openviduSecret;
}
public boolean isOpenViduSecret(String secret) {
return secret.equals(this.getOpenViduSecret());
}
public boolean isCdrEnabled() {
return this.openviduCdr;
}

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

@ -10,7 +10,7 @@ public interface Session {
void leave(String participantPrivateId);
void close();
boolean close();
boolean isClosed();

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

@ -32,18 +32,21 @@ public class SessionEventsHandler {
@Autowired
protected OpenviduConfig openviduConfig;
public void onSessionClosed(String sessionId, Set<Participant> participants) {
JsonObject notifParams = new JsonObject();
notifParams.addProperty(ProtocolElements.ROOMCLOSED_ROOM_PARAM, sessionId);
for (Participant participant : participants) {
rpcNotificationService.sendNotification(participant.getParticipantPrivateId(),
ProtocolElements.ROOMCLOSED_METHOD, notifParams);
public void onSessionCreated(String sessionId) {
if (openviduConfig.isCdrEnabled()) {
CDR.recordSessionCreated(sessionId);
}
}
public void onParticipantJoined(Participant participant, Integer transactionId,
Set<Participant> existingParticipants, OpenViduException error) {
public void onSessionClosed(String sessionId) {
if (openviduConfig.isCdrEnabled()) {
CDR.recordSessionDestroyed(sessionId);
}
}
public void onParticipantJoined(Participant participant, String sessionId,
Set<Participant> existingParticipants, Integer transactionId, OpenViduException error) {
if (error != null) {
rpcNotificationService.sendErrorResponse(participant.getParticipantPrivateId(), transactionId, null, error);
return;
@ -97,10 +100,14 @@ public class SessionEventsHandler {
result.add("value", resultArray);
rpcNotificationService.sendResponse(participant.getParticipantPrivateId(), transactionId, result);
if (openviduConfig.isCdrEnabled()) {
CDR.recordParticipantJoined(participant, sessionId);
}
}
public void onParticipantLeft(Participant participant, Integer transactionId,
Set<Participant> remainingParticipants, OpenViduException error) {
public void onParticipantLeft(Participant participant, String sessionId,
Set<Participant> remainingParticipants, Integer transactionId, OpenViduException error) {
if (error != null) {
rpcNotificationService.sendErrorResponse(participant.getParticipantPrivateId(), transactionId, null, error);
return;
@ -129,11 +136,15 @@ public class SessionEventsHandler {
rpcNotificationService.sendResponse(participant.getParticipantPrivateId(), transactionId, new JsonObject());
}
rpcNotificationService.closeRpcSession(participant.getParticipantPrivateId());
if (openviduConfig.isCdrEnabled()) {
CDR.recordParticipantLeft(participant, sessionId);
}
}
public void onPublishMedia(Participant participant, String sessionId, Integer transactionId, MediaOptions mediaOptions,
String sdpAnswer, Set<Participant> participants, OpenViduException error) {
public void onPublishMedia(Participant participant, String sessionId, MediaOptions mediaOptions,
String sdpAnswer, Set<Participant> participants, Integer transactionId, OpenViduException error) {
if (error != null) {
rpcNotificationService.sendErrorResponse(participant.getParticipantPrivateId(), transactionId, null, error);
return;

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

@ -31,30 +31,22 @@ public abstract class SessionManager {
private volatile boolean closed = false;
public void joinRoom(Participant participant, String sessionId, Integer transactionId) {
}
public abstract void joinRoom(Participant participant, String sessionId, Integer transactionId);
public void leaveRoom(Participant participant, Integer transactionId) {
}
public abstract void leaveRoom(Participant participant, Integer transactionId);
public void publishVideo(Participant participant, MediaOptions mediaOptions, Integer transactionId) {
}
public void unpublishVideo(Participant participant, Integer transactionId) {
}
public void subscribe(Participant participant, String senderName, String sdpOffer, Integer transactionId) {
}
public abstract void publishVideo(Participant participant, MediaOptions mediaOptions, Integer transactionId);
public void unsubscribe(Participant participant, String senderName, Integer transactionId) {
}
public void sendMessage(Participant participant, String message, Integer transactionId) {
}
public abstract void unpublishVideo(Participant participant, Integer transactionId);
public void onIceCandidate(Participant participant, String endpointName, String candidate, int sdpMLineIndex,
String sdpMid, Integer transactionId) {
}
public abstract void subscribe(Participant participant, String senderName, String sdpOffer, Integer transactionId);
public abstract void unsubscribe(Participant participant, String senderName, Integer transactionId);
public abstract void sendMessage(Participant participant, String message, Integer transactionId);
public abstract void onIceCandidate(Participant participant, String endpointName, String candidate,
int sdpMLineIndex, String sdpMid, Integer transactionId);
/**
* Application-originated request to remove a participant from a session. <br/>
@ -200,7 +192,8 @@ public abstract class SessionManager {
public boolean isPublisherInSession(String sessionId, Participant participant) {
if (!this.isInsecureParticipant(participant.getParticipantPrivateId())) {
if (this.sessionidParticipantpublicidParticipant.get(sessionId) != null) {
return ParticipantRole.PUBLISHER.equals(participant.getToken().getRole());
return (ParticipantRole.PUBLISHER.equals(participant.getToken().getRole())
|| ParticipantRole.MODERATOR.equals(participant.getToken().getRole()));
} else {
return false;
}
@ -263,17 +256,15 @@ public abstract class SessionManager {
public void showTokens() {
log.info("<SESSIONID, TOKENS>: {}", this.sessionidTokenTokenobj.toString());
}
public void showInsecureParticipants() {
log.info("<INSECURE_PARTICIPANTS>: {}", this.insecureUsers.toString());
}
public void showAllParticipants() {
log.info("<SESSIONID, PARTICIPANTS>: {}", this.sessionidParticipantpublicidParticipant.toString());
}
/**
* Closes all resources. This method has been annotated with the @PreDestroy
* directive (javax.annotation package) so that it will be automatically called
@ -298,15 +289,15 @@ public abstract class SessionManager {
/**
* Closes an existing session by releasing all resources that were allocated for
* it. Once closed, the session can be reopened (will be empty and it will
* use another Media Pipeline). Existing participants will be evicted. <br/>
* <strong>Dev advice:</strong> The session event handler should send notifications
* to the existing participants in the session to inform that it was forcibly
* closed.
* it. Once closed, the session can be reopened (will be empty and it will use
* another Media Pipeline). Existing participants will be evicted. <br/>
* <strong>Dev advice:</strong> The session event handler should send
* notifications to the existing participants in the session to inform that it
* was forcibly closed.
*
* @param sessionId
* identifier of the session
* @return
* @return
* @return set of {@link Participant} POJOS representing the session's
* participants
* @throws OpenViduException
@ -322,9 +313,7 @@ public abstract class SessionManager {
}
Set<Participant> participants = getParticipants(sessionId);
// copy the ids as they will be removed from the map
Set<String> pids = participants.stream()
.map(Participant::getParticipantPrivateId)
.collect(Collectors.toSet());
Set<String> pids = participants.stream().map(Participant::getParticipantPrivateId).collect(Collectors.toSet());
for (String pid : pids) {
try {
session.leave(pid);

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

@ -155,7 +155,7 @@ public class KurentoSession implements Session {
}
@Override
public void close() {
public boolean close() {
if (!closed) {
for (KurentoParticipant participant : participants.values()) {
@ -174,8 +174,10 @@ public class KurentoSession implements Session {
}
this.closed = true;
return true;
} else {
log.warn("Closing an already closed session '{}'", this.sessionId);
return false;
}
}

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

@ -68,10 +68,10 @@ public class KurentoSessionManager extends SessionManager {
} catch (OpenViduException e) {
log.warn("PARTICIPANT {}: Error joining/creating session {}", participant.getParticipantPublicId(),
sessionId, e);
sessionHandler.onParticipantJoined(participant, transactionId, null, e);
sessionHandler.onParticipantJoined(participant, sessionId, null, transactionId, e);
}
if (existingParticipants != null) {
sessionHandler.onParticipantJoined(participant, transactionId, existingParticipants, null);
sessionHandler.onParticipantJoined(participant, sessionId, existingParticipants, transactionId, null);
}
}
@ -119,7 +119,9 @@ public class KurentoSessionManager extends SessionManager {
}
if (remainingParticipants.isEmpty()) {
log.debug("No more participants in session '{}', removing it and closing it", sessionId);
session.close();
if (session.close()) {
sessionHandler.onSessionClosed(sessionId);
}
sessions.remove(sessionId);
sessionidParticipantpublicidParticipant.remove(sessionId);
@ -130,7 +132,7 @@ public class KurentoSessionManager extends SessionManager {
log.warn("Session '{}' removed and closed", sessionId);
}
sessionHandler.onParticipantLeft(participant, transactionId, remainingParticipants, null);
sessionHandler.onParticipantLeft(participant, sessionId, remainingParticipants, transactionId, null);
}
/**
@ -190,7 +192,7 @@ public class KurentoSessionManager extends SessionManager {
OpenViduException e = new OpenViduException(Code.MEDIA_SDP_ERROR_CODE,
"Error generating SDP response for publishing user " + participant.getParticipantPublicId());
log.error("PARTICIPANT {}: Error publishing media", participant.getParticipantPublicId(), e);
sessionHandler.onPublishMedia(participant, session.getSessionId(), transactionId, mediaOptions, sdpAnswer, participants, e);
sessionHandler.onPublishMedia(participant, session.getSessionId(), mediaOptions, sdpAnswer, participants, transactionId, e);
}
session.newPublisher(participant);
@ -202,7 +204,7 @@ public class KurentoSessionManager extends SessionManager {
participants = kurentoParticipant.getSession().getParticipants();
if (sdpAnswer != null) {
sessionHandler.onPublishMedia(participant, session.getSessionId(), transactionId, mediaOptions, sdpAnswer, participants, null);
sessionHandler.onPublishMedia(participant, session.getSessionId(), mediaOptions, sdpAnswer, participants, transactionId, null);
}
}
@ -357,6 +359,8 @@ public class KurentoSessionManager extends SessionManager {
kcName = kurentoClient.getServerManager().getName();
}
log.warn("No session '{}' exists yet. Created one using KurentoClient '{}'.", sessionId, kcName);
sessionHandler.onSessionCreated(sessionId);
}
/**

10
openvidu-server/src/main/resources/log4j.properties
View File

@ -1,10 +0,0 @@
log4j.rootLogger=INFO, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%p] %d [%.12t] %c (%M) - %m%n
log4j.logger.io.openvidu.server.cdr.CallDetailRecord=INFO, cdr
log4j.appender.cdr=org.apache.log4j.DailyRollingFileAppender
log4j.appender.cdr.File=log/CDR.log
log4j.appender.cdr.layout=org.apache.log4j.PatternLayout
log4j.appender.cdr.layout.ConversionPattern=%m\n

28
openvidu-server/src/main/resources/logback.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<timestamp key="myTimestamp" timeReference="contextBirth" datePattern="HH-mm-ss"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>[%p] %d [%.12t] %c \(%M\) - %msg%n</Pattern>
</layout>
</appender>
<appender name="CDR"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>log/CDR.%d{yyyy-MM-dd}_${myTimestamp}.log</FileNamePattern>
<MaxHistory>30</MaxHistory>
<TotalSizeCap>20GB</TotalSizeCap>
</rollingPolicy>
<layout>
<pattern>%m\n</pattern>
</layout>
</appender>
<logger name="io.openvidu.server.cdr.CallDetailRecord">
<level value="INFO" />
<appender-ref ref="CDR" />
</logger>
<root>
<level value="INFO" />
<appender-ref ref="STDOUT" />
</root>
</configuration>