You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by zh...@apache.org on 2018/03/23 07:05:56 UTC
[incubator-skywalking] branch feature/direct_server updated: Add
direct_servers check (#981)
This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch feature/direct_server
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/feature/direct_server by this push:
new e938973 Add direct_servers check (#981)
e938973 is described below
commit e938973cc65591ffc3ff24bba01dc73cc3eceee3
Author: Xin,Zhang <zh...@apache.org>
AuthorDate: Fri Mar 23 15:05:55 2018 +0800
Add direct_servers check (#981)
---
.../skywalking/apm/agent/core/conf/SnifferConfigInitializer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
index f96f84c..89f7d56 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java
@@ -73,8 +73,8 @@ public class SnifferConfigInitializer {
if (StringUtil.isEmpty(Config.Agent.APPLICATION_CODE)) {
throw new ExceptionInInitializerError("`agent.application_code` is missing.");
}
- if (StringUtil.isEmpty(Config.Collector.SERVERS)) {
- throw new ExceptionInInitializerError("`collector.servers` is missing.");
+ if (StringUtil.isEmpty(Config.Collector.SERVERS) && StringUtil.isEmpty(Config.Collector.DIRECT_SERVERS)) {
+ throw new ExceptionInInitializerError("`collector.direct_servers` and `collector.servers` cannot be empty at the same time.");
}
IS_INIT_COMPLETED = true;
--
To stop receiving notification emails like this one, please contact
zhangxin@apache.org.