Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
apollo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
apollo
Commits
ab773f37
Commit
ab773f37
authored
Sep 13, 2016
by
Jason Song
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add tooling zone support
parent
806ceb44
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
ConfigUtil.java
...main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
+13
-2
No files found.
apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
View file @
ab773f37
...
@@ -7,9 +7,7 @@ import com.ctrip.framework.apollo.core.ConfigConsts;
...
@@ -7,9 +7,7 @@ import com.ctrip.framework.apollo.core.ConfigConsts;
import
com.ctrip.framework.apollo.core.MetaDomainConsts
;
import
com.ctrip.framework.apollo.core.MetaDomainConsts
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.core.enums.Env
;
import
com.ctrip.framework.apollo.core.enums.EnvUtils
;
import
com.ctrip.framework.apollo.core.enums.EnvUtils
;
import
com.ctrip.framework.apollo.exceptions.ApolloConfigException
;
import
com.ctrip.framework.foundation.Foundation
;
import
com.ctrip.framework.foundation.Foundation
;
import
com.dianping.cat.Cat
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -23,6 +21,7 @@ import java.util.concurrent.TimeUnit;
...
@@ -23,6 +21,7 @@ import java.util.concurrent.TimeUnit;
@Named
(
type
=
ConfigUtil
.
class
)
@Named
(
type
=
ConfigUtil
.
class
)
public
class
ConfigUtil
{
public
class
ConfigUtil
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ConfigUtil
.
class
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ConfigUtil
.
class
);
private
static
final
String
TOOLS_CLUSTER
=
"TOOLS"
;
private
int
refreshInterval
=
5
;
private
int
refreshInterval
=
5
;
private
TimeUnit
refreshIntervalTimeUnit
=
TimeUnit
.
MINUTES
;
private
TimeUnit
refreshIntervalTimeUnit
=
TimeUnit
.
MINUTES
;
private
int
connectTimeout
=
1000
;
//1 second
private
int
connectTimeout
=
1000
;
//1 second
...
@@ -66,6 +65,11 @@ public class ConfigUtil {
...
@@ -66,6 +65,11 @@ public class ConfigUtil {
//Load data center from system property
//Load data center from system property
cluster
=
System
.
getProperty
(
ConfigConsts
.
APOLLO_CLUSTER_KEY
);
cluster
=
System
.
getProperty
(
ConfigConsts
.
APOLLO_CLUSTER_KEY
);
//Use TOOLS cluster if tools=true in server.properties
if
(
Strings
.
isNullOrEmpty
(
cluster
)
&&
isToolingZone
())
{
cluster
=
TOOLS_CLUSTER
;
}
//Use data center as cluster
//Use data center as cluster
if
(
Strings
.
isNullOrEmpty
(
cluster
))
{
if
(
Strings
.
isNullOrEmpty
(
cluster
))
{
cluster
=
getDataCenter
();
cluster
=
getDataCenter
();
...
@@ -77,6 +81,13 @@ public class ConfigUtil {
...
@@ -77,6 +81,13 @@ public class ConfigUtil {
}
}
}
}
private
boolean
isToolingZone
()
{
if
(
"true"
.
equalsIgnoreCase
(
Foundation
.
server
().
getProperty
(
"tools"
,
"false"
).
trim
()))
{
return
true
;
}
return
false
;
}
/**
/**
* Get the cluster name for the current application.
* Get the cluster name for the current application.
*
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment