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

Scan for port near default

This commit is contained in:
Dave Syer 2013-11-22 19:59:06 +00:00
parent e69e190ae9
commit 59f07d37ab
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@ -113,7 +113,7 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer {
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
Integer port = getPort();
if (this.scan) {
port = SocketUtils.findAvailableTcpPort(port != null ? 8080 : port);
port = scanForPort(port);
}
if (port != null) {
factory.setPort(port);
@ -132,6 +132,26 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer {
}
}
private Integer scanForPort(Integer port) {
boolean found = false;
int delta = 1;
port = port == null ? 8080 : port;
while (!found) {
try {
port = SocketUtils.findAvailableTcpPort(port, port + delta);
found = true;
}
catch (IllegalStateException e) {
if (delta > 65536) {
throw e;
}
delta = delta > 5 ? delta > 100 ? delta * 4 : delta * 3 : delta * 2;
}
port = port + delta;
}
return port;
}
public static class Tomcat {
private String accessLogPattern;

9
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
View File

@ -80,6 +80,15 @@ public class ServerPropertiesTests {
assertTrue(factory.getPort() > 1000);
}
@Test
public void testPortScanFromHigher() throws Exception {
this.properties.setScan(true);
this.properties.setPort(5678);
ConfigurableEmbeddedServletContainerFactory factory = new MockEmbeddedServletContainerFactory();
this.properties.customize(factory);
assertTrue(factory.getPort() < 6000);
}
// FIXME test customize
}