You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/11/29 19:16:56 UTC
nifi-minifi git commit: MINIFI-132 Adjusting default log
configuration to reduce overall footprint of logs and to enable compression
by default.
Repository: nifi-minifi
Updated Branches:
refs/heads/master 98877d674 -> d623521b1
MINIFI-132 Adjusting default log configuration to reduce overall footprint of logs and to enable compression by default.
Upgrading logback dependencies to 1.1.7 and specifying size cap.
This closes #56
Signed-off-by: Joseph Percivall <JP...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/d623521b
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/d623521b
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/d623521b
Branch: refs/heads/master
Commit: d623521b1a7a6a8fddfde919bfecb8274ffd3c83
Parents: 98877d6
Author: Aldrin Piri <al...@apache.org>
Authored: Wed Nov 16 17:17:16 2016 -0500
Committer: Joseph Percivall <JP...@apache.org>
Committed: Tue Nov 29 14:16:52 2016 -0500
----------------------------------------------------------------------
minifi-assembly/NOTICE | 4 +-
.../src/main/resources/conf/logback.xml | 61 +++++---------------
pom.xml | 16 +----
3 files changed, 18 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/minifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/minifi-assembly/NOTICE b/minifi-assembly/NOTICE
index d343786..a193179 100644
--- a/minifi-assembly/NOTICE
+++ b/minifi-assembly/NOTICE
@@ -638,8 +638,8 @@ The following binary components are provided under the Eclipse Public License 1.
(EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.aspectj.org)
(EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html)
- (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/)
- (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.7 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.7 - http://logback.qos.ch/)
*****************
Mozilla Public License v2.0
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
index e071858..f7f6f26 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
@@ -21,41 +21,28 @@
<appender name="APP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/minifi-app.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--
For daily rollover, use 'app_%d.log'.
For hourly rollover, use 'app_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
- <fileNamePattern>./logs/minifi-app_%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!-- keep 30 log files worth of history -->
- <maxHistory>30</maxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
- <immediateFlush>true</immediateFlush>
- </encoder>
- </appender>
-
- <appender name="USER_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>logs/minifi-user.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>./logs/minifi-app_%d{yyyy-MM-dd_HH}.%i.log.gz</fileNamePattern>
+ <!-- Keep 10 rolling periods worth of log files-->
+ <maxHistory>10</maxHistory>
+ <!-- Max size each log file will be-->
+ <maxFileSize>1MB</maxFileSize>
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
- To GZIP rolled files, replace '.log' with '.log.gz'.
- To ZIP rolled files, replace '.log' with '.log.zip'.
+ Provide a cap of 10 MB across all archive files
+ NOTE: Size constraints are not guaranteed due to a bug in logback as per
+ http://jira.qos.ch/browse/LOGBACK-1166
-->
- <fileNamePattern>./logs/minifi-user_%d.log</fileNamePattern>
- <!-- keep 30 log files worth of history -->
- <maxHistory>30</maxHistory>
+ <totalSizeCap>10MB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
+ <immediateFlush>true</immediateFlush>
</encoder>
</appender>
@@ -68,8 +55,8 @@
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
- <fileNamePattern>./logs/minifi-bootstrap_%d.log</fileNamePattern>
- <!-- keep 5 log files worth of history -->
+ <fileNamePattern>./logs/minifi-bootstrap_%d.log.gz</fileNamePattern>
+ <!-- Keep 5 rolling periods worth of logs-->
<maxHistory>5</maxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -88,9 +75,6 @@
<logger name="org.apache.nifi" level="INFO"/>
<logger name="org.apache.nifi.controller.repository.StandardProcessSession" level="WARN" />
- <!-- Logger for logging HTTP requests received by the web server. -->
- <logger name="org.apache.nifi.server.JettyServer" level="INFO"/>
-
<!-- Logger for managing logging statements for jetty -->
<logger name="org.eclipse.jetty" level="INFO"/>
@@ -103,25 +87,6 @@
<logger name="com.sun.jersey.spi.inject.Errors" level="ERROR"/>
<!--
- Logger for capturing user events. We do not want to propagate these
- log events to the root logger. These messages are only sent to the
- user-log appender.
- -->
- <logger name="org.apache.nifi.web.security" level="INFO" additivity="false">
- <appender-ref ref="USER_FILE"/>
- </logger>
- <logger name="org.apache.nifi.web.api.config" level="INFO" additivity="false">
- <appender-ref ref="USER_FILE"/>
- </logger>
- <logger name="org.apache.nifi.authorization" level="INFO" additivity="false">
- <appender-ref ref="USER_FILE"/>
- </logger>
- <logger name="org.apache.nifi.web.filter.RequestLogger" level="INFO" additivity="false">
- <appender-ref ref="USER_FILE"/>
- </logger>
-
-
- <!--
Logger for capturing Bootstrap logs and MiNiFi's standard error and standard out.
-->
<logger name="org.apache.nifi.minifi.bootstrap" level="INFO" additivity="false">
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/d623521b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02adbb8..5678666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,23 +95,13 @@ limitations under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2016</inceptionYear>
<org.slf4j.version>1.7.12</org.slf4j.version>
- <logback.version>1.1.3</logback.version>
<org.apache.nifi.version>1.0.0</org.apache.nifi.version>
- <jetty.version>9.2.11.v20150529</jetty.version>
+ <logback.version>1.1.7</logback.version>
<jetty.version>9.3.9.v20160517</jetty.version>
- <lucene.version>4.10.4</lucene.version>
- <spring.version>4.2.4.RELEASE</spring.version>
- <spring.security.version>4.0.3.RELEASE</spring.security.version>
<jersey.version>1.19</jersey.version>
- <hadoop.version>2.6.2</hadoop.version>
- <hadoop.guava.version>12.0.1</hadoop.guava.version>
- <hadoop.http.client.version>4.2.5</hadoop.http.client.version>
<yammer.metrics.version>2.2.0</yammer.metrics.version>
- <ranger.version>0.6.0</ranger.version>
- <hive.version>1.2.1</hive.version>
- <hive.hadoop.version>2.6.2</hive.hadoop.version>
- <hbase.version>1.1.2</hbase.version>
- <storm.version>1.0.1</storm.version>
+ <spring.version>4.2.4.RELEASE</spring.version>
+ <spring.security.version>4.0.3.RELEASE</spring.security.version>
</properties>
<dependencies>