You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2021/08/02 14:18:17 UTC
[nifi] branch main updated: NIFI-8952 Fixed logback.xml files
BOOTSTRAP_FILE appender commentary
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8c4c6ce NIFI-8952 Fixed logback.xml files BOOTSTRAP_FILE appender commentary
8c4c6ce is described below
commit 8c4c6cedf6fd56de1c465b7cb3f5d10694a53b01
Author: Kevin Silva <ke...@outlook.com>
AuthorDate: Wed Jul 28 10:09:37 2021 -0300
NIFI-8952 Fixed logback.xml files BOOTSTRAP_FILE appender commentary
This closes #5257
Signed-off-by: David Handermann <ex...@apache.org>
---
minifi/minifi-integration-tests/src/test/resources/logback.xml | 4 ++--
.../minifi-resources/src/main/resources/conf/logback.xml | 4 ++--
.../nifi-resources/src/main/resources/conf/logback.xml | 4 ++--
.../nifi-registry-resources/src/main/resources/conf/logback.xml | 8 ++++----
.../src/test/resources/conf/clustered/node1/logback.xml | 4 ++--
.../src/test/resources/conf/clustered/node2/logback.xml | 4 ++--
.../src/test/resources/conf/default/logback.xml | 4 ++--
.../nifi-toolkit-admin/src/test/resources/conf/logback.xml | 4 ++--
.../src/test/resources/upgrade/conf/logback.xml | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/minifi/minifi-integration-tests/src/test/resources/logback.xml b/minifi/minifi-integration-tests/src/test/resources/logback.xml
index 7226fe3..b0baaf3 100644
--- a/minifi/minifi-integration-tests/src/test/resources/logback.xml
+++ b/minifi/minifi-integration-tests/src/test/resources/logback.xml
@@ -33,8 +33,8 @@
<file>${org.apache.nifi.minifi.bootstrap.config.log.dir}/minifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
index d0257a1..bbb4831 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/logback.xml
@@ -46,8 +46,8 @@
<file>${org.apache.nifi.minifi.bootstrap.config.log.dir}/minifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 714302e..f208ec4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -61,8 +61,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
index e05e95f..36ffa92 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/logback.xml
@@ -44,8 +44,8 @@
<file>${org.apache.nifi.registry.bootstrap.config.log.dir}/nifi-registry-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
@@ -62,8 +62,8 @@
<file>${org.apache.nifi.registry.bootstrap.config.log.dir}/nifi-registry-event.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'event_%d.log'.
+ For hourly rollover, use 'event_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/logback.xml b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/logback.xml
index 524f259..89ca35e 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/logback.xml
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/logback.xml
@@ -61,8 +61,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/logback.xml b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/logback.xml
index 7fe99b7..05ed5d5 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/logback.xml
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/logback.xml
@@ -61,8 +61,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/logback.xml b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/logback.xml
index 5e0b22e..cc69039 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/logback.xml
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/logback.xml
@@ -61,8 +61,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml
index f77af2e..042ee48 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/conf/logback.xml
@@ -63,8 +63,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
diff --git a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml
index 1927a2e..d3ace7a 100644
--- a/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/src/test/resources/upgrade/conf/logback.xml
@@ -61,8 +61,8 @@
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-bootstrap.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--
- For daily rollover, use 'user_%d.log'.
- For hourly rollover, use 'user_%d{yyyy-MM-dd_HH}.log'.
+ For daily rollover, use 'bootstrap_%d.log'.
+ For hourly rollover, use 'bootstrap_%d{yyyy-MM-dd_HH}.log'.
To GZIP rolled files, replace '.log' with '.log.gz'.
To ZIP rolled files, replace '.log' with '.log.zip'.
-->