SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't handle EmbeddedServletContainerInitializedEvent from management

Browse Source 
fixes gh-46
This commit is contained in:
Spencer Gibb
2015-07-31 12:48:36 -06:00
parent eb929d6b9e
commit 360560bd37
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java
View File

@@ -147,16 +147,16 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
* @return the serviceId of the Management Service
*/
protected String getManagementServiceId() {
return this.context.getId() + ":management";
// TODO: configurable management suffix
return this.context.getId() + ":management";
}
/**
* @return the service name of the Management Service
*/
protected String getManagementServiceName() {
return getAppName() + ":management";
// TODO: configurable management suffix
return getAppName() + ":management";
}
/**
@@ -206,8 +206,11 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle,
@Override
public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
// TODO: take SSL into account when Spring Boot 1.2 is available
this.port.compareAndSet(0, event.getEmbeddedServletContainer().getPort());
this.start();
// TODO: take SSL into account
// Don't register the management port as THE port
if (!"management".equals(event.getApplicationContext().getNamespace())) {
this.port.compareAndSet(0, event.getEmbeddedServletContainer().getPort());
this.start();
}
}
}

13
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycleTests.java
View File

@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.WebIntegrationTest;
@@ -17,15 +18,23 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = AbstractDiscoveryLifecycleTests.Config.class)
@WebIntegrationTest(randomPort = true)
@WebIntegrationTest(randomPort = true, value = "management.port=0")
public class AbstractDiscoveryLifecycleTests {
@Autowired
private TestDiscoveryLifecycle lifecycle;
@Value("${local.server.port}")
private int port;
@Value("${local.management.port}")
private int managementPort;
@Test
public void randomPortWorks() {
public void portsWork() {
assertNotEquals("Lifecycle port is zero", 0, lifecycle.getPort().get());
assertNotEquals("Lifecycle port is management port", managementPort, lifecycle.getPort().get());
assertEquals("Lifecycle port is wrong", port, lifecycle.getPort().get());
assertTrue("Lifecycle not running", lifecycle.isRunning());
assertTrue("Lifecycle not registered", lifecycle.isRegistered());
}