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

Fix ClasspathLoggingApplicationListener order

Browse Source 
Commit 3de25164 inadvertently caused early debug logging from the
ClasspathLoggingApplicationListener. We now set its order relative
to the LoggingApplicationListener.

See gh-2543
This commit is contained in:
Phillip Webb
2015-07-09 16:48:49 -07:00
parent eeb947b382
commit 8280004f80
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.event.GenericApplicationListener;
import org.springframework.context.event.SmartApplicationListener;
import org.springframework.core.Ordered;
import org.springframework.core.ResolvableType;
/**
@@ -40,7 +39,7 @@ import org.springframework.core.ResolvableType;
public final class ClasspathLoggingApplicationListener implements
GenericApplicationListener {
private static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 12;
private static final int ORDER = LoggingApplicationListener.DEFAULT_ORDER + 1;
private final Log logger = LogFactory.getLog(getClass());

7
spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
View File

@@ -64,6 +64,11 @@ import org.springframework.util.StringUtils;
*/
public class LoggingApplicationListener implements GenericApplicationListener {
/**
* The default order for the LoggingApplicationListener.
*/
public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 20;
/**
* The name of the Spring property that contains a reference to the logging
* configuration to load.
@@ -109,7 +114,7 @@ public class LoggingApplicationListener implements GenericApplicationListener {
private LoggingSystem loggingSystem;
private int order = Ordered.HIGHEST_PRECEDENCE + 20;
private int order = DEFAULT_ORDER;
private boolean parseArgs = true;