Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
2f37158e
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2f37158e
编写于
12月 13, 2018
作者:
J
Jared Tan
提交者:
GitHub
12月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify code style (#2041)
* modify code style * ci
上级
dfe2b085
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
32 addition
and
20 deletion
+32
-20
oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml
...erver/server-cluster-plugin/cluster-consul-plugin/pom.xml
+2
-2
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
...rver/cluster/plugin/consul/ClusterModuleConsulConfig.java
+0
-0
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
...er/cluster/plugin/consul/ClusterModuleConsulProvider.java
+13
-7
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
...g/oap/server/cluster/plugin/consul/ConsulCoordinator.java
+13
-7
oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
...pache.skywalking.oap.server.library.module.ModuleProvider
+0
-0
oap-server/server-cluster-plugin/pom.xml
oap-server/server-cluster-plugin/pom.xml
+2
-2
oap-server/server-starter/pom.xml
oap-server/server-starter/pom.xml
+2
-2
未找到文件。
oap-server/server-cluster-plugin/cluster
_consul_
plugin/pom.xml
→
oap-server/server-cluster-plugin/cluster
-consul-
plugin/pom.xml
浏览文件 @
2f37158e
...
...
@@ -27,7 +27,7 @@
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cluster
_consul_
plugin
</artifactId>
<artifactId>
cluster
-consul-
plugin
</artifactId>
<packaging>
jar
</packaging>
<dependencies>
...
...
@@ -52,4 +52,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</project>
oap-server/server-cluster-plugin/cluster
_consul_
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
→
oap-server/server-cluster-plugin/cluster
-consul-
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
浏览文件 @
2f37158e
文件已移动
oap-server/server-cluster-plugin/cluster
_consul_
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
→
oap-server/server-cluster-plugin/cluster
-consul-
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
浏览文件 @
2f37158e
...
...
@@ -20,12 +20,20 @@ package org.apache.skywalking.oap.server.cluster.plugin.consul;
import
com.google.common.net.HostAndPort
;
import
com.orbitz.consul.Consul
;
import
java.util.*
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
import
org.apache.skywalking.oap.server.core.cluster.*
;
import
org.apache.skywalking.oap.server.library.module.*
;
import
org.apache.skywalking.oap.server.library.util.*
;
import
org.slf4j.*
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterModule
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterRegister
;
import
org.apache.skywalking.oap.server.library.module.ModuleConfig
;
import
org.apache.skywalking.oap.server.library.module.ModuleProvider
;
import
org.apache.skywalking.oap.server.library.module.ModuleStartException
;
import
org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException
;
import
org.apache.skywalking.oap.server.library.util.Address
;
import
org.apache.skywalking.oap.server.library.util.ConnectStringParseException
;
import
org.apache.skywalking.oap.server.library.util.ConnectUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* Use consul to manage all service instances in SkyWalking cluster.
...
...
@@ -34,8 +42,6 @@ import org.slf4j.*;
*/
public
class
ClusterModuleConsulProvider
extends
ModuleProvider
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ClusterModuleConsulProvider
.
class
);
private
final
ClusterModuleConsulConfig
config
;
private
Consul
client
;
...
...
oap-server/server-cluster-plugin/cluster
_consul_
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
→
oap-server/server-cluster-plugin/cluster
-consul-
plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
浏览文件 @
2f37158e
...
...
@@ -19,22 +19,28 @@
package
org.apache.skywalking.oap.server.cluster.plugin.consul
;
import
com.google.common.base.Strings
;
import
com.orbitz.consul.*
;
import
com.orbitz.consul.model.agent.*
;
import
com.orbitz.consul.AgentClient
;
import
com.orbitz.consul.Consul
;
import
com.orbitz.consul.HealthClient
;
import
com.orbitz.consul.model.agent.ImmutableRegistration
;
import
com.orbitz.consul.model.agent.Registration
;
import
com.orbitz.consul.model.health.ServiceHealth
;
import
java.util.*
;
import
org.apache.skywalking.oap.server.core.cluster.*
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery
;
import
org.apache.skywalking.oap.server.core.cluster.ClusterRegister
;
import
org.apache.skywalking.oap.server.core.cluster.RemoteInstance
;
import
org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException
;
import
org.apache.skywalking.oap.server.core.remote.client.Address
;
import
org.apache.skywalking.oap.server.library.util.CollectionUtils
;
import
org.slf4j.*
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Objects
;
/**
* @author peng-yongsheng
*/
public
class
ConsulCoordinator
implements
ClusterRegister
,
ClusterNodesQuery
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ConsulCoordinator
.
class
);
private
final
Consul
client
;
private
final
String
serviceName
;
private
volatile
Address
selfAddress
;
...
...
oap-server/server-cluster-plugin/cluster
_consul_
plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
→
oap-server/server-cluster-plugin/cluster
-consul-
plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
浏览文件 @
2f37158e
文件已移动
oap-server/server-cluster-plugin/pom.xml
浏览文件 @
2f37158e
...
...
@@ -31,7 +31,7 @@
<module>
cluster-zookeeper-plugin
</module>
<module>
cluster-standalone-plugin
</module>
<module>
cluster-kubernetes-plugin
</module>
<module>
cluster
_consul_
plugin
</module>
<module>
cluster
-consul-
plugin
</module>
</modules>
<dependencies>
...
...
@@ -46,4 +46,4 @@
<version>
${project.version}
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</project>
oap-server/server-starter/pom.xml
浏览文件 @
2f37158e
...
...
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>
org.apache.skywalking
</groupId>
<artifactId>
cluster
_consul_
plugin
</artifactId>
<artifactId>
cluster
-consul-
plugin
</artifactId>
<version>
${project.version}
</version>
</dependency>
<!-- cluster module -->
...
...
@@ -186,4 +186,4 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录