This is an automated email from the ASF dual-hosted git repository. sunzesong pushed a commit to branch jira_970 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fa3488aecf78ae4ccf12f4d59b5508acd7e8fdd5 Author: samperson1997 <[email protected]> AuthorDate: Thu Oct 29 10:25:07 2020 +0800 [IOTDB-970] Change logback rollingPolicy and triggeringPolicy --- cli/src/test/resources/logback.xml | 52 +++++++------ server/src/assembly/resources/conf/logback.xml | 104 +++++++++++++------------ tsfile/src/test/resources/logback.xml | 52 +++++++------ 3 files changed, 112 insertions(+), 96 deletions(-) diff --git a/cli/src/test/resources/logback.xml b/cli/src/test/resources/logback.xml index 51841e3..df71a20 100644 --- a/cli/src/test/resources/logback.xml +++ b/cli/src/test/resources/logback.xml @@ -23,13 +23,14 @@ <property name="LOG_PATH" value="target/logs"/> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR"> <file>${LOG_PATH}/log_error.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-error.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>10MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -43,13 +44,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN"> <file>${LOG_PATH}/log_warn.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-warn.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>10MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -63,13 +65,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO"> <file>${LOG_PATH}/log_info.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-info.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -83,13 +86,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG"> <file>${LOG_PATH}/log_debug.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-debug.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml index 91e47cc..1d564eb 100644 --- a/server/src/assembly/resources/conf/logback.xml +++ b/server/src/assembly/resources/conf/logback.xml @@ -25,13 +25,14 @@ <statusListener class="ch.qos.logback.core.status.NopStatusListener"/> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR"> <file>${IOTDB_HOME}/logs/log_error.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-error.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>10MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -45,13 +46,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN"> <file>${IOTDB_HOME}/logs/log_warn.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-warn.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>1MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -65,13 +67,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO"> <file>${IOTDB_HOME}/logs/log_info.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-info.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -85,13 +88,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG"> <file>${IOTDB_HOME}/logs/log_debug.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-debug.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -116,13 +120,14 @@ <!-- a log appender that collect all log records whose level is greather than debug--> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEALL"> <file>${IOTDB_HOME}/logs/log_all.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-all.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -134,13 +139,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_COST_MEASURE"> <file>${IOTDB_HOME}/logs/log_measure.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-measure.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -152,13 +158,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SYNC"> <file>${IOTDB_HOME}/logs/log_sync.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-sync.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> @@ -170,13 +177,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT"> <file>${IOTDB_HOME}/logs/log_audit.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${IOTDB_HOME}/logs/log-audit.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%d [%t] %-5p %C:%L - %m %n</pattern> diff --git a/tsfile/src/test/resources/logback.xml b/tsfile/src/test/resources/logback.xml index c584375..61cafec 100644 --- a/tsfile/src/test/resources/logback.xml +++ b/tsfile/src/test/resources/logback.xml @@ -25,13 +25,14 @@ <statusListener class="ch.qos.logback.core.status.NopStatusListener"/> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR"> <file>${LOG_PATH}/log_error.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-error.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>10MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -45,13 +46,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN"> <file>${LOG_PATH}/log_warn.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>10MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-warn.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>10MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -65,13 +67,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO"> <file>${LOG_PATH}/log_info.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-info.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern> @@ -85,13 +88,14 @@ </appender> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG"> <file>${LOG_PATH}/log_debug.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <fileNamePattern>${LOG_PATH}/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> - <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> - <maxFileSize>50MB</maxFileSize> - <maxBackupIndex>50</maxBackupIndex> - </timeBasedFileNamingAndTriggeringPolicy> + <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <fileNamePattern>${LOG_PATH}/log-debug.%i.log</fileNamePattern> + <minIndex>1</minIndex> + <maxIndex>10</maxIndex> </rollingPolicy> + <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <maxFileSize>50MB</maxFileSize> + </triggeringPolicy> <append>true</append> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <pattern>%-5p [%d] %C:%L - %m %n</pattern>
