Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-12-15 14:03:30 +01:00
parent bf8509d27e ac866707d5
commit 8e4af4154c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@
<junit.version>4.12</junit.version>
<liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.7</logback.version>
<logback.version>1.1.8</logback.version>
<lombok.version>1.16.10</lombok.version>
<mariadb.version>1.4.6</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>

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

@@ -26,6 +26,7 @@ import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
import ch.qos.logback.core.util.FileSize;
import ch.qos.logback.core.util.OptionHelper;
import org.springframework.boot.bind.RelaxedPropertyResolver;
@@ -137,7 +138,7 @@ class DefaultLogbackConfiguration {
config.start(rollingPolicy);
SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>();
triggeringPolicy.setMaxFileSize("10MB");
triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
appender.setTriggeringPolicy(triggeringPolicy);
config.start(triggeringPolicy);