root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Upgrade to Logback 1.1.8 

Closes gh-7638
This commit is contained in:
Stephane Nicoll 2016-12-15 14:01:03 +01:00
parent 601b5ced49
commit a2d46dc16c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -124,7 +124,7 @@
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<liquibase.version>3.5.3</liquibase.version> <liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.6.2</log4j2.version> <log4j2.version>2.6.2</log4j2.version>
<logback.version>1.1.7</logback.version> <logback.version>1.1.8</logback.version>
<lombok.version>1.16.10</lombok.version> <lombok.version>1.16.10</lombok.version>
<mariadb.version>1.4.6</mariadb.version> <mariadb.version>1.4.6</mariadb.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>

5
spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@ import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.rolling.FixedWindowRollingPolicy; import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
import ch.qos.logback.core.util.FileSize;
import ch.qos.logback.core.util.OptionHelper; import ch.qos.logback.core.util.OptionHelper;
import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.bind.RelaxedPropertyResolver;
@ -142,7 +143,7 @@ class DefaultLogbackConfiguration {
config.start(rollingPolicy); config.start(rollingPolicy);
SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>(); SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>();
triggeringPolicy.setMaxFileSize("10MB"); triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
appender.setTriggeringPolicy(triggeringPolicy); appender.setTriggeringPolicy(triggeringPolicy);
config.start(triggeringPolicy); config.start(triggeringPolicy);