Merge branch '3.3.x'

Closes gh-43377
This commit is contained in:
Stéphane Nicoll 2024-12-04 10:57:58 +01:00
commit 60b028e7cb
25 changed files with 67 additions and 67 deletions

View File

@ -39,15 +39,15 @@
</RollingFile> </RollingFile>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/> <Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
<AppenderRef ref="File"/> <AppenderRef ref="File"/>
</Root> </Root>

View File

@ -17,21 +17,21 @@
<PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/> <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" charset="${sys:CONSOLE_LOG_CHARSET}"/>
</DefaultArbiter> </DefaultArbiter>
</Select> </Select>
<filters> <Filters>
<ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/> <ThresholdFilter level="${sys:CONSOLE_LOG_THRESHOLD:-TRACE}"/>
</filters> </Filters>
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="org.apache.catalina.startup.DigesterFactory" level="error" /> <Logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
<Logger name="org.apache.catalina.util.LifecycleBase" level="error" /> <Logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
<Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" /> <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
<Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/> <Logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
<Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" /> <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
<Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" /> <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
<Logger name="org.hibernate.validator.internal.util.Version" level="warn" /> <Logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
<Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/> <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
<Root level="info"> <Root level="INFO">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
</Root> </Root>
</Loggers> </Loggers>