spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2018-12-18 19:36:43 -05:00
parent 3659a9206a 55884acd85
commit ed56c5c1f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarConfiguration.java
+3 -3
View File
@@ -90,16 +90,16 @@ public class SidecarConfiguration {
@Autowired
private InetUtils inetUtils;
@Value(value = "${management.port:${MANAGEMENT_PORT:#{null}}}")
@Value(value = "${management.server.port:${MANAGEMENT_PORT:#{null}}}")
private Integer managementPort;
@Value("${server.port:${SERVER_PORT:${PORT:8080}}}")
private int serverPort = 8080;
@Value("${management.context-path:${MANAGEMENT_CONTEXT_PATH:#{null}}}")
@Value("${management.server.servlet.context-path:${MANAGEMENT_CONTEXT_PATH:#{null}}}")
private String managementContextPath;
@Value("${server.context-path:${SERVER_CONTEXT_PATH:/}}")
@Value("${server.servlet.context-path:${SERVER_CONTEXT_PATH:/}}")
private String serverContextPath = "/";
@Value("${eureka.instance.hostname:${EUREKA_INSTANCE_HOSTNAME:}}")