Merge pull request apolloconfig#412 from nobodyiam/tooling-cluster-new

Tooling cluster new
sk163 · Sep 19, 2016 · 33b2d12 · 33b2d12
2 parents 33c59a5 + 455782f
commit 33b2d12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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
@@ -21,7 +21,7 @@
 @Named(type = ConfigUtil.class)
 public class ConfigUtil {
   private static final Logger logger = LoggerFactory.getLogger(ConfigUtil.class);
-  private static final String TOOLS_CLUSTER = "TOOLS";
+  private static final String TOOLING_CLUSTER = "TOOLING";
   private int refreshInterval = 5;
   private TimeUnit refreshIntervalTimeUnit = TimeUnit.MINUTES;
   private int connectTimeout = 1000; //1 second
@@ -65,9 +65,9 @@ private void initCluster() {
     //Load data center from system property
     cluster = System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY);
 
-    //Use TOOLS cluster if tools=true in server.properties
+    //Use TOOLING cluster if tooling=true in server.properties
     if (Strings.isNullOrEmpty(cluster) && isToolingZone()) {
-      cluster = TOOLS_CLUSTER;
+      cluster = TOOLING_CLUSTER;
     }
 
     //Use data center as cluster
@@ -82,7 +82,7 @@ private void initCluster() {
   }
 
   private boolean isToolingZone() {
-    if ("true".equalsIgnoreCase(Foundation.server().getProperty("tools", "false").trim())) {
+    if ("true".equalsIgnoreCase(Foundation.deployment().getProperty("tooling", "false").trim())) {
       return true;
     }
     return false;

diff --git a/pom.xml b/pom.xml
@@ -139,7 +139,7 @@
 			<dependency>
 				<groupId>com.ctrip.framework</groupId>
 				<artifactId>framework-foundation</artifactId>
-				<version>1.1.7</version>
+				<version>1.1.8-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>