This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.3
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.3 by this push:
new 7f81994 RANGER-3631: logback.xml updated to fix incorrect format, set
maxHistory=15 and cleanHistoryOnStart=true
7f81994 is described below
commit 7f81994d9bcfd29f07a18ab3554204dff5cbe4b6
Author: Kirby Zhou <[email protected]>
AuthorDate: Fri Feb 18 21:11:39 2022 +0800
RANGER-3631: logback.xml updated to fix incorrect format, set maxHistory=15
and cleanHistoryOnStart=true
Signed-off-by: Madhan Neethiraj <[email protected]>
(cherry picked from commit 4473560aa018bec8f3e28bc747a7a68e5f84c556)
---
kms/config/kms-webapp/kms-logback.xml | 4 ++++
security-admin/src/main/webapp/WEB-INF/logback.xml | 22 +++++++++++++++-------
tagsync/conf.dist/logback.xml | 2 ++
unixauthservice/conf.dist/logback.xml | 2 ++
.../{conf.dist => src/main/resources}/logback.xml | 6 ++++--
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/kms/config/kms-webapp/kms-logback.xml
b/kms/config/kms-webapp/kms-logback.xml
index d47e86c..16e82a6 100644
--- a/kms/config/kms-webapp/kms-logback.xml
+++ b/kms/config/kms-webapp/kms-logback.xml
@@ -28,6 +28,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${kms.log.dir}/kms-audit-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<appender name="kms-metric" class="ch.qos.logback.core.FileAppender">
@@ -49,6 +51,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${kms.log.dir}/ranger-kms-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<logger
name="com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator"
level="OFF"/>
diff --git a/security-admin/src/main/webapp/WEB-INF/logback.xml
b/security-admin/src/main/webapp/WEB-INF/logback.xml
index 4b3e7b5..997f3bc 100644
--- a/security-admin/src/main/webapp/WEB-INF/logback.xml
+++ b/security-admin/src/main/webapp/WEB-INF/logback.xml
@@ -28,6 +28,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/ranger-admin-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<appender name="sql_appender"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -37,10 +39,12 @@
<file>${logdir}/ranger_admin_sql.log</file>
<append>true</append>
<encoder>
- <pattern>%d [%t] %-5p %C{6} (%F:%L) %msg%n</pattern>
+ <pattern>%d [%t] %-5p %C{6} \(%F:%L\) %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/ranger_admin_sql.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<appender name="perf_appender"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -54,6 +58,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/ranger_admin_perf.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<appender name="patch_logger"
class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -63,28 +69,30 @@
<append>true</append>
<file>${logdir}/ranger_db_patch.log</file>
<encoder>
- <pattern>%d [%t] %-5p %C{6} (%F:%L) %msg%n</pattern>
+ <pattern>%d [%t] %-5p %C{6} \(%F:%L\) %msg%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/ranger_db_patch.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<logger name="xa" additivity="false" level="info">
<appender-ref ref="xa_log_appender"/>
</logger>
- <logger name="jdbc.connection" additivity="false" level="fatal">
+ <logger name="jdbc.connection" additivity="false" level="error">
<appender-ref ref="sql_appender"/>
</logger>
- <logger name="org.apache.ranger.perf" level="DEBUG">
+ <logger name="org.apache.ranger.perf" additivity="false" level="info">
<appender-ref ref="perf_appender"/>
</logger>
- <logger name="jdbc.audit" additivity="false" level="fatal">
+ <logger name="jdbc.audit" additivity="false" level="error">
<appender-ref ref="sql_appender"/>
</logger>
<logger name="org.apache.ranger.patch" additivity="false" level="info">
<appender-ref ref="patch_logger"/>
</logger>
- <logger name="jdbc.resultset" additivity="false" level="fatal">
+ <logger name="jdbc.resultset" additivity="false" level="error">
<appender-ref ref="sql_appender"/>
</logger>
<logger name="org.springframework" additivity="false" level="warn">
@@ -99,7 +107,7 @@
<logger name="org.apache.ranger" additivity="false" level="info">
<appender-ref ref="xa_log_appender"/>
</logger>
- <logger name="jdbc.sqlonly" additivity="false" level="fatal">
+ <logger name="jdbc.sqlonly" additivity="false" level="error">
<appender-ref ref="sql_appender"/>
</logger>
<root level="warn">
diff --git a/tagsync/conf.dist/logback.xml b/tagsync/conf.dist/logback.xml
index a465306..c1a94fe 100644
--- a/tagsync/conf.dist/logback.xml
+++ b/tagsync/conf.dist/logback.xml
@@ -27,6 +27,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/tagsync.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<root level="info">
diff --git a/unixauthservice/conf.dist/logback.xml
b/unixauthservice/conf.dist/logback.xml
index 21ba4f3..9c4e266 100644
--- a/unixauthservice/conf.dist/logback.xml
+++ b/unixauthservice/conf.dist/logback.xml
@@ -27,6 +27,8 @@
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logdir}/usersync-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<root level="info">
diff --git a/unixauthservice/conf.dist/logback.xml
b/unixauthservice/src/main/resources/logback.xml
similarity index 90%
copy from unixauthservice/conf.dist/logback.xml
copy to unixauthservice/src/main/resources/logback.xml
index 21ba4f3..e96421b 100644
--- a/unixauthservice/conf.dist/logback.xml
+++ b/unixauthservice/src/main/resources/logback.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration>
+<configuration scan="true">
<appender name="logFile"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
<!--and
http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
@@ -26,7 +26,9 @@
<pattern>%d{dd MMM yyyy HH:mm:ss} %5p %c{1} [%t] - %m%n</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${logdir}/usersync-${hostname}-${user}.log.%d{yyyy-MM-dd}</fileNamePattern>
+
<fileNamePattern>${logdir}/usersync-${hostname}-${user}.log.%d{'.'yyyy-MM-dd}</fileNamePattern>
+ <maxHistory>15</maxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy>
</appender>
<root level="info">
