Browse Source

Fallback to server.port if management.port not set.

See gh-896
pull/6/head
Spencer Gibb 9 years ago
parent
commit
4f31596e4f
  1. 6
      spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarConfiguration.java

6
spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarConfiguration.java

@ -61,14 +61,14 @@ public class SidecarConfiguration {
@Autowired @Autowired
private InetUtils inetUtils; private InetUtils inetUtils;
@Value("${management.port:${MANAGEMENT_PORT:${PORT:8080}}}") @Value("${management.port:${MANAGEMENT_PORT:${server.port:${SERVER_PORT:${PORT:8080}}}}}")
private int managementPort = 8080; private int managementPort = 8080;
@Value("${eureka.instance.hostname:${EUREKA_INSTANCE_HOSTNAME:}}") @Value("${eureka.instance.hostname:${EUREKA_INSTANCE_HOSTNAME:}}")
String hostname; private String hostname;
@Autowired @Autowired
ConfigurableEnvironment env; private ConfigurableEnvironment env;
@Bean @Bean
public EurekaInstanceConfigBean eurekaInstanceConfigBean() { public EurekaInstanceConfigBean eurekaInstanceConfigBean() {

Loading…
Cancel
Save