commit | d7340f7c9a13c73137fce16a96b96ae06fea40ea | [log] [tgz] |
---|---|---|
author | ryan xu <fengbaicanhe@users.noreply.github.com> | Sun Apr 21 16:06:30 2019 +0800 |
committer | Willem Jiang <jiangning9@huawei.com> | Sun Apr 21 16:06:30 2019 +0800 |
tree | d8d398b4521aa9295aaee7b5224e449b31c24ce5 | |
parent | c2b1a6d603b0fb3d658a495da29d6f864995b538 [diff] |
SCB-1264 fix lost consul metadata, such as 'secure=false' fix when server.port=0, health check fail and also fix lose consul metadata, such as 'secure=false' (#454)
diff --git a/alpha/alpha-spring-cloud-starter-consul/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/consul/AlphaConsulAutoConfiguration.java b/alpha/alpha-spring-cloud-starter-consul/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/consul/AlphaConsulAutoConfiguration.java index 53351db..9bfaab4 100644 --- a/alpha/alpha-spring-cloud-starter-consul/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/consul/AlphaConsulAutoConfiguration.java +++ b/alpha/alpha-spring-cloud-starter-consul/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/consul/AlphaConsulAutoConfiguration.java
@@ -114,7 +114,9 @@ NewService newservice = new NewService(); newservice.setName(service.getServiceName()); newservice.setId(service.getServiceId()); - List<String> tags = consulDiscoveryProperties.getTags(); + newservice.setAddress(service.getAddress()); + newservice.setPort(service.getServicePort()); + List<String> tags = service.getServiceTags(); tags.remove("alpha-server-port=0"); tags.add("alpha-server-port="+actualAlphaServerPort); newservice.setTags(tags);