You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/07/09 06:33:41 UTC

[servicecomb-pack] branch master updated: add NACOS to DiscoveryType

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c8d109  add NACOS to DiscoveryType
6c8d109 is described below

commit 6c8d10983fc2575b1973458f5d602d60338eb18a
Author: CMonkey <42...@gmail.com>
AuthorDate: Mon Jul 8 16:07:06 2019 +0800

    add NACOS to DiscoveryType
---
 .../servicecomb/pack/omega/connector/grpc/AlphaClusterDiscovery.java    | 2 +-
 .../servicecomb/pack/omega/spring/cloud/OmegaSpringNacosConfig.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterDiscovery.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterDiscovery.java
index b79b811..385a3b5 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterDiscovery.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/AlphaClusterDiscovery.java
@@ -50,7 +50,7 @@ public class AlphaClusterDiscovery {
     }
 
     public enum DiscoveryType{
-        DEFAULT,EUREKA,CONSUL,ZOOKEEPER
+        DEFAULT,EUREKA,CONSUL,ZOOKEEPER, NACOS
     }
 
     public static final Builder builder(){
diff --git a/omega/omega-spring-cloud-nacos-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringNacosConfig.java b/omega/omega-spring-cloud-nacos-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringNacosConfig.java
index 6007464..5083ea7 100644
--- a/omega/omega-spring-cloud-nacos-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringNacosConfig.java
+++ b/omega/omega-spring-cloud-nacos-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringNacosConfig.java
@@ -62,7 +62,7 @@ class OmegaSpringNacosConfig {
 
         if (alphaAddresses.length > 0) {
             AlphaClusterDiscovery alphaClusterDiscovery = AlphaClusterDiscovery.builder()
-                    .discoveryType(AlphaClusterDiscovery.DiscoveryType.ZOOKEEPER)
+                    .discoveryType(AlphaClusterDiscovery.DiscoveryType.NACOS)
                     .discoveryInfo(serviceUrls.toString())
                     .addresses(alphaAddresses)
                     .build();