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

support random server port

Browse Source 
dependent on 6b916473e9

fixes gh-23
This commit is contained in:
Spencer Gibb
2015-05-22 13:14:48 -06:00
parent 14398f2d9a
commit 57be854177
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java
View File

@@ -42,17 +42,26 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
@Autowired
private HeartbeatProperties ttlConfig;
private NewService service = new NewService();
@Override
protected int getConfiguredPort() {
return service.getPort() == null? 0 : service.getPort();
}
@Override
protected void setConfiguredPort(int port) {
service.setPort(port);
}
@Override
protected void register() {
NewService service = new NewService();
String appName = getAppName();
// TODO: move id to properties with context ID as default
service.setId(getContext().getId());
service.setName(appName);
// TODO: support port = 0 random assignment
Integer port = new Integer(getEnvironment().getProperty("server.port", "8080"));
service.setPort(port);
service.setTags(properties.getTags());
NewService.Check check = new NewService.Check();
if (ttlConfig.isEnabled()) {
check.setTtl(ttlConfig.getTtl());
@@ -61,11 +70,12 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
check.setHttp(properties.getHealthCheckUrl());
} else {
check.setHttp(String.format("http://%s:%s%s", properties.getHostname(),
port, properties.getHealthCheckPath()));
service.getPort(), properties.getHealthCheckPath()));
}
check.setInterval(properties.getHealthCheckInterval());
//TODO support http check timeout
service.setCheck(check);
register(service);
}
@@ -80,11 +90,11 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
register(management);
}
protected void register(NewService service) {
log.info("Registering service with consul: {}", service.toString());
client.agentServiceRegister(service);
protected void register(NewService newService) {
log.info("Registering service with consul: {}", newService.toString());
client.agentServiceRegister(newService);
if (ttlConfig.isEnabled() && ttlScheduler != null) {
ttlScheduler.add(service);
ttlScheduler.add(newService);
}
}