CDR file only created when openvidu.cdr thanks to conditional logback.xml

pull/30/head
pabloFuente 2018-02-02 19:45:39 +01:00
parent 1182fec876
commit e9110c5a12
5 changed files with 57 additions and 19 deletions

View File

@ -1,5 +1,6 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -211,6 +212,12 @@
<artifactId>openvidu-java-client</artifactId> <artifactId>openvidu-java-client</artifactId>
<version>1.7.0</version> <version>1.7.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.0.7</version>
</dependency>
<!-- Test dependencies --> <!-- Test dependencies -->

View File

@ -0,0 +1,13 @@
# Required metadata
sonar.projectKey=java-sonar-runner-simple
sonar.projectName=Sonar OpenVidu Server
sonar.projectVersion=1.0
# Comma-separated paths to directories with sources (required)
sonar.sources=src
# Language
sonar.language=java
# Encoding of the source files
sonar.sourceEncoding=UTF-8

View File

@ -14,6 +14,7 @@ import io.openvidu.server.core.Participant;
/** /**
* CDR logger to register all information of each WebRTC connection: * CDR logger to register all information of each WebRTC connection:
* Enabled by property 'openvidu.cdr=true'
* *
* - Participant unique identifier * - Participant unique identifier
* - Session unique identifier * - Session unique identifier

View File

@ -5,6 +5,9 @@ server.ssl.enabled: false
server.address: 0.0.0.0 server.address: 0.0.0.0
kms.uris=[\"ws://localhost:8888/kurento\"] kms.uris=[\"ws://localhost:8888/kurento\"]
openvidu.secret: MY_SECRET openvidu.secret: MY_SECRET
openvidu.publicurl: ngrok openvidu.publicurl: ngrok
openvidu.cdr: false
openvidu.recording: false
openvidu.recording.path: /opt/openvidu/recordings
openvidu.recording.free-access: false

View File

@ -1,15 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<timestamp key="myTimestamp" timeReference="contextBirth" datePattern="HH-mm-ss"/> <timestamp key="myTimestamp" timeReference="contextBirth"
datePattern="HH-mm-ss" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<layout class="ch.qos.logback.classic.PatternLayout"> <layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>[%p] %d [%.12t] %c \(%M\) - %msg%n</Pattern> <Pattern>[%p] %d [%.12t] %c \(%M\) - %msg%n</Pattern>
</layout> </layout>
</appender> </appender>
<root>
<level value="INFO" />
<appender-ref ref="STDOUT" />
</root>
<if condition='property("spring.profiles.active").contains("ngrok")'>
<then>
<property scope="context" resource="application-ngrok.properties" />
</then>
<else>
<property scope="context" resource="application.properties" />
</else>
</if>
<if condition='property("openvidu.cdr").contains("true")'>
<then>
<appender name="CDR" <appender name="CDR"
class="ch.qos.logback.core.rolling.RollingFileAppender"> class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>log/CDR.%d{yyyy-MM-dd}_${myTimestamp}.log</FileNamePattern> <FileNamePattern>log/CDR.%d{yyyy-MM-dd}_${myTimestamp}.log
</FileNamePattern>
<MaxHistory>30</MaxHistory> <MaxHistory>30</MaxHistory>
<TotalSizeCap>20GB</TotalSizeCap> <TotalSizeCap>20GB</TotalSizeCap>
</rollingPolicy> </rollingPolicy>
@ -21,8 +37,6 @@
<level value="INFO" /> <level value="INFO" />
<appender-ref ref="CDR" /> <appender-ref ref="CDR" />
</logger> </logger>
<root> </then>
<level value="INFO" /> </if>
<appender-ref ref="STDOUT" />
</root>
</configuration> </configuration>