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

Merge branch '2.1.x'

Browse Source 
Closes gh-18682
This commit is contained in:
Stephane Nicoll
2019-10-22 09:41:04 +02:00
parent ab2d06c0eb 429eec0bcf
commit 4d5d90847e
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-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.outputStream = new ConnectionOutputStream(outputStream);
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();
}
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 {
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 {
synchronized (this.monitor) {
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);
int localPort = this.serverSocket.getLocalPort();
this.listenThread = this.threadFactory.newThread(this::acceptConnections);