Repository: lens Updated Branches: refs/heads/master 7ad12ed73 -> d524cc24e
LENS-772 : Fix time and size based rolling for logs Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d524cc24 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d524cc24 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d524cc24 Branch: refs/heads/master Commit: d524cc24eb93b1ad44c8c148f3d9aabff0740b54 Parents: 7ad12ed Author: Amareshwari Sriramadasu <amareshw...@gmail.com> Authored: Wed Sep 23 17:41:41 2015 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Wed Sep 23 17:41:41 2015 +0530 ---------------------------------------------------------------------- tools/conf-pseudo-distr/client/logback.xml | 10 ++++--- tools/conf-pseudo-distr/server/logback.xml | 37 +++++++++++++------------ tools/conf/client/logback.xml | 10 ++++--- tools/conf/server/logback.xml | 37 +++++++++++++------------ 4 files changed, 50 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/d524cc24/tools/conf-pseudo-distr/client/logback.xml ---------------------------------------------------------------------- diff --git a/tools/conf-pseudo-distr/client/logback.xml b/tools/conf-pseudo-distr/client/logback.xml index d142348..8617e17 100644 --- a/tools/conf-pseudo-distr/client/logback.xml +++ b/tools/conf-pseudo-distr/client/logback.xml @@ -33,14 +33,16 @@ </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensclient.log.%d{yyyy-MM-dd}</fileNamePattern> + <fileNamePattern>${lens.log.dir}/lensclient.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <MaxFileSize>100MB</MaxFileSize> - </triggeringPolicy> </appender> <logger name="org.springframework" level="OFF"/> <logger name="ch.qos.logback" level="WARN"/> http://git-wip-us.apache.org/repos/asf/lens/blob/d524cc24/tools/conf-pseudo-distr/server/logback.xml ---------------------------------------------------------------------- diff --git a/tools/conf-pseudo-distr/server/logback.xml b/tools/conf-pseudo-distr/server/logback.xml index c27bea2..63ab23c 100644 --- a/tools/conf-pseudo-distr/server/logback.xml +++ b/tools/conf-pseudo-distr/server/logback.xml @@ -31,18 +31,18 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="REQUEST" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -50,18 +50,18 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver-requests.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver-requests.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -69,8 +69,12 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver-query-status.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver-query-status.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> @@ -78,9 +82,6 @@ <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="QueryExecutionStatistics" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -132,4 +133,4 @@ <appender-ref ref="ROOT" /> <appender-ref ref="SIFT" /> </root> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/lens/blob/d524cc24/tools/conf/client/logback.xml ---------------------------------------------------------------------- diff --git a/tools/conf/client/logback.xml b/tools/conf/client/logback.xml index d142348..8617e17 100644 --- a/tools/conf/client/logback.xml +++ b/tools/conf/client/logback.xml @@ -33,14 +33,16 @@ </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensclient.log.%d{yyyy-MM-dd}</fileNamePattern> + <fileNamePattern>${lens.log.dir}/lensclient.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <MaxFileSize>100MB</MaxFileSize> - </triggeringPolicy> </appender> <logger name="org.springframework" level="OFF"/> <logger name="ch.qos.logback" level="WARN"/> http://git-wip-us.apache.org/repos/asf/lens/blob/d524cc24/tools/conf/server/logback.xml ---------------------------------------------------------------------- diff --git a/tools/conf/server/logback.xml b/tools/conf/server/logback.xml index c27bea2..63ab23c 100644 --- a/tools/conf/server/logback.xml +++ b/tools/conf/server/logback.xml @@ -31,18 +31,18 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="REQUEST" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -50,18 +50,18 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver-requests.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver-requests.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> - <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -69,8 +69,12 @@ <append>true</append> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <!-- daily rollover --> - <fileNamePattern>${lens.log.dir}/lensserver-query-status.log.%d{yyyy-MM-dd}</fileNamePattern> - + <fileNamePattern>${lens.log.dir}/lensserver-query-status.log.%d{yyyy-MM-dd}.%i</fileNamePattern> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> + <!-- or whenever the file size reaches 10MB --> + <maxFileSize>10MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> <!-- keep 30 days' worth of history --> <maxHistory>30</maxHistory> </rollingPolicy> @@ -78,9 +82,6 @@ <encoder> <pattern>%d{dd MMM yyyy HH:mm:ss,SSS} [%X{logSegregationId}] [%t] %-5p %c - %m%n</pattern> </encoder> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> - <maxFileSize>100MB</maxFileSize> - </triggeringPolicy> </appender> <appender name="QueryExecutionStatistics" class="ch.qos.logback.core.rolling.RollingFileAppender"> @@ -132,4 +133,4 @@ <appender-ref ref="ROOT" /> <appender-ref ref="SIFT" /> </root> -</configuration> \ No newline at end of file +</configuration>