This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 9e308da80e389ebcc7e1ba5d795e2c8b9dd33f85 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Fri Dec 31 16:54:38 2021 +0100 JSPWIKI-1168: Simplify required configuration to log on file --- .../WikiBootstrapServletContextListenerTest.java | 2 +- .../src/test/resources/ini/jspwiki.properties | 19 ++++++++++++++++++- .../src/main/resources/ini/jspwiki.properties | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java index 643993c..bdc6cc0 100644 --- a/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java +++ b/jspwiki-bootstrap/src/test/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListenerTest.java @@ -41,7 +41,7 @@ public class WikiBootstrapServletContextListenerTest { final WikiBootstrapServletContextListener listener = new WikiBootstrapServletContextListener(); final Properties properties = listener.initWikiSPIs( sce ); - Assertions.assertEquals( 19, properties.size() ); + Assertions.assertEquals( 35, properties.size() ); } @Test diff --git a/jspwiki-bootstrap/src/test/resources/ini/jspwiki.properties b/jspwiki-bootstrap/src/test/resources/ini/jspwiki.properties index 30312a7..cd0acc7 100644 --- a/jspwiki-bootstrap/src/test/resources/ini/jspwiki.properties +++ b/jspwiki-bootstrap/src/test/resources/ini/jspwiki.properties @@ -4,7 +4,7 @@ jspwiki.provider.impl.context=org.apache.wiki.bootstrap.spi.ContextSPITestImpl jspwiki.provider.impl.engine=org.apache.wiki.bootstrap.spi.EngineSPITestImpl jspwiki.provider.impl.session=org.apache.wiki.bootstrap.spi.SessionSPITestImpl -status = warn +status = debug name = jspwiki-log4j2-configuration apenders=console @@ -13,6 +13,23 @@ appender.console.name = STDOUT appender.console.layout.type = PatternLayout appender.console.layout.pattern = %highlight{[%-5level]} %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1.} - %msg%n %ex +appender.rolling.name = RollingFile +appender.rolling.type = RollingFile +appender.rolling.fileName = ${sys:java.io.tmpdir}/jspwiki.log +appender.rolling.filePattern = ${sys:java.io.tmpdir}/jspwiki-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz +appender.rolling.append = true +appender.rolling.createOnDemand = true +appender.rolling.layout.type = PatternLayout +appender.rolling.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %p %c{1.} %x - %msg%n %ex +appender.rolling.policies.type = Policies +appender.rolling.policies.time.type = TimeBasedTriggeringPolicy +appender.rolling.policies.time.interval = 1 +appender.rolling.policies.time.modulate = true +appender.rolling.policies.size.type = SizeBasedTriggeringPolicy +appender.rolling.policies.size.size=10MB +appender.rolling.strategy.type = DefaultRolloverStrategy +appender.rolling.strategy.max = 14 + # Log to console loggers=jspwiki logger.jspwiki.name = org.apache.wiki diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties index 5a8f9c4..2c4bcff 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki.properties +++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties @@ -887,6 +887,23 @@ appender.console.name = STDOUT appender.console.layout.type = PatternLayout appender.console.layout.pattern = %highlight{[%-5level]} %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1.} - %msg%n %ex +appender.rolling.name = RollingFile +appender.rolling.type = RollingFile +appender.rolling.fileName = ${sys:java.io.tmpdir}/jspwiki.log +appender.rolling.filePattern = ${sys:java.io.tmpdir}/jspwiki-%d{MM-dd-yy-HH-mm-ss}-%i.log.gz +appender.rolling.append = true +appender.rolling.createOnDemand = true +appender.rolling.layout.type = PatternLayout +appender.rolling.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %p %c{1.} %x - %msg%n %ex +appender.rolling.policies.type = Policies +appender.rolling.policies.time.type = TimeBasedTriggeringPolicy +appender.rolling.policies.time.interval = 1 +appender.rolling.policies.time.modulate = true +appender.rolling.policies.size.type = SizeBasedTriggeringPolicy +appender.rolling.policies.size.size=10MB +appender.rolling.strategy.type = DefaultRolloverStrategy +appender.rolling.strategy.max = 14 + # Log to console logger.jspwiki.name = org.apache.wiki logger.jspwiki.level = info
