From 06773bfbcc325f70de0b94c7de09852f0a4ca81d Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 30 Nov 2016 15:32:34 +0800 Subject: [PATCH] treat DEV and LPT as a cluster --- .../java/com/ctrip/framework/apollo/util/ConfigUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java index cd7491e13..d9c753362 100644 --- a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java +++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java @@ -65,6 +65,14 @@ public class ConfigUtil { //Load data center from system property cluster = System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY); + String env = Foundation.server().getEnvType(); + //LPT and DEV will be treated as a cluster(lower case) + if (Strings.isNullOrEmpty(cluster) && + (Env.DEV.name().equalsIgnoreCase(env) || Env.LPT.name().equalsIgnoreCase(env)) + ) { + cluster = env.toLowerCase(); + } + //Use TOOLING cluster if tooling=true in server.properties if (Strings.isNullOrEmpty(cluster) && isToolingZone()) { cluster = TOOLING_CLUSTER; -- GitLab