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

Merge pull request #18604 from wycm

Browse Source 
* pr/18604:
  Optimize debug level logs

Closes gh-18604
This commit is contained in:
Stephane Nicoll
2019-10-22 09:40:33 +02:00
parent 91f4300fee 681a94b0d5
commit 429eec0bcf
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View File

@@ -174,7 +174,9 @@ public class JobLauncherCommandLineRunner implements CommandLineRunner, Ordered,
if (StringUtils.hasText(this.jobNames)) { if (StringUtils.hasText(this.jobNames)) {
String[] jobsToRun = this.jobNames.split(","); String[] jobsToRun = this.jobNames.split(",");
if (!PatternMatchUtils.simpleMatch(jobsToRun, job.getName())) { if (!PatternMatchUtils.simpleMatch(jobsToRun, job.getName())) {
logger.debug("Skipped job: " + job.getName()); if (logger.isDebugEnabled()) {
logger.debug("Skipped job: " + job.getName());
}
continue; continue;
} }
} }
@@ -194,7 +196,9 @@ public class JobLauncherCommandLineRunner implements CommandLineRunner, Ordered,
execute(job, jobParameters); execute(job, jobParameters);
} }
catch (NoSuchJobException ex) { catch (NoSuchJobException ex) {
logger.debug("No job found in registry for job name: " + jobName); if (logger.isDebugEnabled()) {
logger.debug("No job found in registry for job name: " + jobName);
}
} }
} }
} }

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
View File

@@ -63,7 +63,7 @@ class ArtemisEmbeddedConfigurationFactory {
TransportConfiguration transportConfiguration = new TransportConfiguration(InVMAcceptorFactory.class.getName(), TransportConfiguration transportConfiguration = new TransportConfiguration(InVMAcceptorFactory.class.getName(),
this.properties.generateTransportParameters()); this.properties.generateTransportParameters());
configuration.getAcceptorConfigurations().add(transportConfiguration); configuration.getAcceptorConfigurations().add(transportConfiguration);
if (this.properties.isDefaultClusterPassword()) { if (this.properties.isDefaultClusterPassword() && logger.isDebugEnabled()) {
logger.debug("Using default Artemis cluster password: " + this.properties.getClusterPassword()); logger.debug("Using default Artemis cluster password: " + this.properties.getClusterPassword());
} }
configuration.setClusterPassword(this.properties.getClusterPassword()); configuration.setClusterPassword(this.properties.getClusterPassword());

8
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java
View File

@@ -68,7 +68,9 @@ class Connection {
this.inputStream = new ConnectionInputStream(inputStream); this.inputStream = new ConnectionInputStream(inputStream);
this.outputStream = new ConnectionOutputStream(outputStream); this.outputStream = new ConnectionOutputStream(outputStream);
this.header = this.inputStream.readHeader(); this.header = this.inputStream.readHeader();
logger.debug("Established livereload connection [" + this.header + "]"); if (logger.isDebugEnabled()) {
logger.debug("Established livereload connection [" + this.header + "]");
}
} }
/** /**
@@ -107,7 +109,9 @@ class Connection {
throw new ConnectionClosedException(); throw new ConnectionClosedException();
} }
else if (frame.getType() == Frame.Type.TEXT) { else if (frame.getType() == Frame.Type.TEXT) {
logger.debug("Received LiveReload text frame " + frame); if (logger.isDebugEnabled()) {
logger.debug("Received LiveReload text frame " + frame);
}
} }
else { else {
throw new IOException("Unexpected Frame Type " + frame.getType()); throw new IOException("Unexpected Frame Type " + frame.getType());

4
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
View File

@@ -109,7 +109,9 @@ public class LiveReloadServer {
public int start() throws IOException { public int start() throws IOException {
synchronized (this.monitor) { synchronized (this.monitor) {
Assert.state(!isStarted(), "Server already started"); Assert.state(!isStarted(), "Server already started");
logger.debug("Starting live reload server on port " + this.port); if (logger.isDebugEnabled()) {
logger.debug("Starting live reload server on port " + this.port);
}
this.serverSocket = new ServerSocket(this.port); this.serverSocket = new ServerSocket(this.port);
int localPort = this.serverSocket.getLocalPort(); int localPort = this.serverSocket.getLocalPort();
this.listenThread = this.threadFactory.newThread(this::acceptConnections); this.listenThread = this.threadFactory.newThread(this::acceptConnections);

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java
View File

@@ -113,7 +113,9 @@ final class FailureAnalyzers implements SpringBootExceptionReporter {
} }
} }
catch (Throwable ex) { catch (Throwable ex) {
logger.debug("FailureAnalyzer " + analyzer + " failed", ex); if (logger.isDebugEnabled()) {
logger.debug("FailureAnalyzer " + analyzer + " failed", ex);
}
} }
} }
return null; return null;