This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2946bda31d09f245c74e75762b20aca177f57c8a
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Apr 11 18:56:38 2018 +0700
[OPENMEETINGS-1864] logback files are improved
---
.../src/main/resources/logback.xml | 25 +++--
.../src/main/resources/logback.xsd | 109 ---------------------
.../main/webapp/WEB-INF/classes/logback-config.xml | 34 +++----
.../src/test/resources/logback-test.xml | 36 +++----
4 files changed, 39 insertions(+), 165 deletions(-)
diff --git a/openmeetings-screenshare/src/main/resources/logback.xml
b/openmeetings-screenshare/src/main/resources/logback.xml
index 8b6c297..a55fccb 100644
--- a/openmeetings-screenshare/src/main/resources/logback.xml
+++ b/openmeetings-screenshare/src/main/resources/logback.xml
@@ -19,26 +19,25 @@
-->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:noNamespaceSchemaLocation="logback.xsd">
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<contextName>${current_openmeetings_context_name}</contextName>
<jmxConfigurator contextName="${current_openmeetings_context_name}" />
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <File>screensharing.log</File>
- <Append>false</Append>
- <Encoding>UTF-8</Encoding>
- <BufferedIO>false</BufferedIO>
- <ImmediateFlush>true</ImmediateFlush>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %L %c{10} [%t] -
%m%n</pattern>
- </layout>
+ <file>screensharing.log</file>
+ <append>false</append>
+ <immediateFlush>true</immediateFlush>
+ <encoder>
+ <charset>UTF-8</charset>
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %c{15}:%L
[%.15thread] - %m%n</pattern>
+ </encoder>
</appender>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %L %c{10} [%t] -
%m%n</pattern>
- </layout>
+ <encoder>
+ <charset>UTF-8</charset>
+ <pattern>%highlight(%-5level) %d{MM-dd HH:mm:ss.SSS }
%cyan(%c{15}:%L [%.15thread]) - %m%n</pattern>
+ </encoder>
</appender>
<logger name="org.apache.openmeetings" level="DEBUG"/>
<logger name="org.red5.server.net.rtmp.codec.RTMPProtocolDecoder"
level="OFF"/>
diff --git a/openmeetings-screenshare/src/main/resources/logback.xsd
b/openmeetings-screenshare/src/main/resources/logback.xsd
deleted file mode 100644
index cc5ad1c..0000000
--- a/openmeetings-screenshare/src/main/resources/logback.xsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
- <xs:element name="configuration">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="contextName"/>
- <xs:element ref="jmxConfigurator"/>
- <xs:element maxOccurs="unbounded" ref="appender"/>
- <xs:element maxOccurs="unbounded" ref="logger"/>
- <xs:element ref="root"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="contextName" type="xs:string"/>
- <xs:element name="jmxConfigurator">
- <xs:complexType>
- <xs:attribute name="contextName" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="appender">
- <xs:complexType>
- <xs:sequence>
- <xs:sequence minOccurs="0">
- <xs:element ref="File"/>
- <xs:element ref="Append"/>
- <xs:element ref="Encoding"/>
- <xs:element ref="BufferedIO"/>
- <xs:element ref="ImmediateFlush"/>
- </xs:sequence>
- <xs:element ref="layout"/>
- </xs:sequence>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="File" type="xs:string"/>
- <xs:element name="Append" type="xs:boolean"/>
- <xs:element name="Encoding" type="xs:NCName"/>
- <xs:element name="BufferedIO" type="xs:boolean"/>
- <xs:element name="ImmediateFlush" type="xs:boolean"/>
- <xs:element name="layout">
- <xs:complexType>
- <xs:choice>
- <xs:element ref="Pattern"/>
- <xs:element ref="pattern"/>
- </xs:choice>
- <xs:attribute name="class" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Pattern" type="xs:string"/>
- <xs:element name="pattern" type="xs:string"/>
- <xs:element name="logger">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" ref="appender-ref"/>
- <xs:element maxOccurs="1" minOccurs="0" ref="level"/>
- </xs:sequence>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:attribute name="level" type="LoggerLevels" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="root">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="appender-ref"/>
- </xs:sequence>
- <xs:attribute name="level" type="LoggerLevels" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="appender-ref">
- <xs:complexType>
- <xs:attribute name="ref" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:complexType name="level">
- <xs:sequence>
- <xs:element ref="level"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="level">
- <xs:complexType>
- <xs:attribute name="value" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:simpleType name="LoggerLevels">
- <xs:restriction base="xs:string">
- <xs:pattern
value="off|OFF|all|ALL|inherited|INHERITED|null|NULL|error|ERROR|warn|WARN|info|INFO|debug|DEBUG|trace|TRACE"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
diff --git
a/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
index 3d841a5..d965572 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
@@ -24,31 +24,23 @@
<jmxConfigurator contextName="${current_openmeetings_context_name}" />
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>log/${current_openmeetings_context_name}.log</File>
- <Append>false</Append>
- <Encoding>UTF-8</Encoding>
- <BufferedIO>false</BufferedIO>
- <ImmediateFlush>true</ImmediateFlush>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %5p %d{MM-dd HH:mm:ss.SSS } %c{15}:%L
[%.15thread] - %m%n
- </Pattern>
- </layout>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- daily rollover -->
-
<fileNamePattern>log\${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <!-- or whenever the file size reaches 100MB -->
- <maxFileSize>50MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!-- keep 30 days' worth of history -->
- <maxHistory>50</maxHistory>
+ <file>log/${current_openmeetings_context_name}.log</file>
+ <immediateFlush>true</immediateFlush>
+ <encoder>
+ <charset>UTF-8</charset>
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %c{15}:%L
[%.15thread] - %m%n</pattern>
+ </encoder>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>log/${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>7</maxHistory>
</rollingPolicy>
</appender>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
+ <encoder>
+ <charset>UTF-8</charset>
<pattern>%highlight(%-5level) %d{MM-dd HH:mm:ss.SSS }
%cyan(%c{15}:%L [%.15thread]) - %m%n</pattern>
- </layout>
+ </encoder>
</appender>
<logger name="com.mchange.v2" level="ERROR" />
<logger name="org.apache.axiom" level="ERROR" />
diff --git a/openmeetings-web/src/test/resources/logback-test.xml
b/openmeetings-web/src/test/resources/logback-test.xml
index 6463b06..d965572 100644
--- a/openmeetings-web/src/test/resources/logback-test.xml
+++ b/openmeetings-web/src/test/resources/logback-test.xml
@@ -24,31 +24,23 @@
<jmxConfigurator contextName="${current_openmeetings_context_name}" />
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <File>log/${current_openmeetings_context_name}.log</File>
- <Append>false</Append>
- <Encoding>UTF-8</Encoding>
- <BufferedIO>false</BufferedIO>
- <ImmediateFlush>true</ImmediateFlush>
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>
- %5p %d{MM-dd HH:mm:ss.SSS } %c{15}:%L
[%.15thread] - %m%n
- </Pattern>
- </layout>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- daily rollover -->
-
<fileNamePattern>log\${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <!-- or whenever the file size reaches 100MB -->
- <maxFileSize>50MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!-- keep 30 days' worth of history -->
- <maxHistory>50</maxHistory>
+ <file>log/${current_openmeetings_context_name}.log</file>
+ <immediateFlush>true</immediateFlush>
+ <encoder>
+ <charset>UTF-8</charset>
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %c{15}:%L
[%.15thread] - %m%n</pattern>
+ </encoder>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>log/${current_openmeetings_context_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>7</maxHistory>
</rollingPolicy>
</appender>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %r %L %c{15}
[%.15thread] - %m%n</pattern>
- </layout>
+ <encoder>
+ <charset>UTF-8</charset>
+ <pattern>%highlight(%-5level) %d{MM-dd HH:mm:ss.SSS }
%cyan(%c{15}:%L [%.15thread]) - %m%n</pattern>
+ </encoder>
</appender>
<logger name="com.mchange.v2" level="ERROR" />
<logger name="org.apache.axiom" level="ERROR" />
--
To stop receiving notification emails like this one, please contact
solo...@apache.org.
