This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 5c09fe1c76 Fix merge conflict
5c09fe1c76 is described below
commit 5c09fe1c76fe68466ce59d3602591ba6fa7cb338
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Jul 4 11:52:58 2024 +0200
Fix merge conflict
---
.../rolling/RollingAppenderDirectCronTest.xml | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git
a/log4j-core-test/src/test/resources/appender/rolling/RollingAppenderDirectCronTest.xml
b/log4j-core-test/src/test/resources/appender/rolling/RollingAppenderDirectCronTest.xml
index 5d340145fb..f9017646a6 100644
---
a/log4j-core-test/src/test/resources/appender/rolling/RollingAppenderDirectCronTest.xml
+++
b/log4j-core-test/src/test/resources/appender/rolling/RollingAppenderDirectCronTest.xml
@@ -15,24 +15,19 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="off" name="XMLConfigTest">
- <Properties>
- <Property name="logDir">${test:logging.path}</Property>
- </Properties>
+<Configuration xmlns="https://logging.apache.org/xml/ns";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-config-2.xsd";
+ status="OFF">
<Appenders>
- <RollingFile name="RollingFile"
filePattern="${logDir}/%d{MM-dd-yy-HH-mm-ss}/processor.log">
- <PatternLayout>
- <Pattern>%d} %p %C{1.} [%t] %m%n</Pattern>
- </PatternLayout>
- <TimeBasedTriggeringPolicy />
- <DirectWriteRolloverStrategy/>
+ <RollingFile name="RollingFile"
filePattern="${test:logging.path}/test-%d{yyyy-MM-dd'T'hh-mm-ss}.log">
+ <PatternLayout pattern="%d{yyyy-MM-dd'T'hh-mm-ss} %m%n"/>
+ <CronTriggeringPolicy schedule="* * * * * ?"/>
</RollingFile>
</Appenders>
-
<Loggers>
- <Root level="info">
+ <Root level="DEBUG">
<AppenderRef ref="RollingFile"/>
</Root>
</Loggers>
-
</Configuration>
