Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
4b49f981
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
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,发现更多精彩内容 >>
提交
4b49f981
编写于
10月 08, 2017
作者:
彭
彭勇升 Buddha
提交者:
GitHub
10月 08, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #484 from wu-sheng/feature/new-register-flow
Improve the register flow
上级
8eed412b
a20d6ea2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
2 deletion
+6
-2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
.../main/java/org/skywalking/apm/agent/core/conf/Config.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java
...ng/apm/agent/core/remote/AppAndServiceRegisterClient.java
+5
-1
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
浏览文件 @
4b49f981
...
@@ -41,7 +41,7 @@ public class Config {
...
@@ -41,7 +41,7 @@ public class Config {
/**
/**
* application and service registry check interval
* application and service registry check interval
*/
*/
public
static
long
APP_AND_SERVICE_REGISTER_CHECK_INTERVAL
=
10
;
public
static
long
APP_AND_SERVICE_REGISTER_CHECK_INTERVAL
=
3
;
/**
/**
* discovery rest check interval
* discovery rest check interval
*/
*/
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/AppAndServiceRegisterClient.java
浏览文件 @
4b49f981
...
@@ -87,7 +87,9 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
...
@@ -87,7 +87,9 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
@Override
@Override
public
void
run
()
{
public
void
run
()
{
if
(
CONNECTED
.
equals
(
status
))
{
boolean
shouldTry
=
true
;
while
(
CONNECTED
.
equals
(
status
)
&&
shouldTry
)
{
shouldTry
=
false
;
try
{
try
{
if
(
RemoteDownstreamConfig
.
Agent
.
APPLICATION_ID
==
DictionaryUtil
.
nullValue
())
{
if
(
RemoteDownstreamConfig
.
Agent
.
APPLICATION_ID
==
DictionaryUtil
.
nullValue
())
{
if
(
applicationRegisterServiceBlockingStub
!=
null
)
{
if
(
applicationRegisterServiceBlockingStub
!=
null
)
{
...
@@ -95,6 +97,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
...
@@ -95,6 +97,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
Application
.
newBuilder
().
addApplicationCode
(
Config
.
Agent
.
APPLICATION_CODE
).
build
());
Application
.
newBuilder
().
addApplicationCode
(
Config
.
Agent
.
APPLICATION_CODE
).
build
());
if
(
applicationMapping
.
getApplicationCount
()
>
0
)
{
if
(
applicationMapping
.
getApplicationCount
()
>
0
)
{
RemoteDownstreamConfig
.
Agent
.
APPLICATION_ID
=
applicationMapping
.
getApplication
(
0
).
getValue
();
RemoteDownstreamConfig
.
Agent
.
APPLICATION_ID
=
applicationMapping
.
getApplication
(
0
).
getValue
();
shouldTry
=
true
;
}
}
}
}
}
else
{
}
else
{
...
@@ -119,6 +122,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
...
@@ -119,6 +122,7 @@ public class AppAndServiceRegisterClient implements BootService, GRPCChannelList
.
setRegisterTime
(
System
.
currentTimeMillis
())
.
setRegisterTime
(
System
.
currentTimeMillis
())
.
setOsinfo
(
OSUtil
.
buildOSInfo
())
.
setOsinfo
(
OSUtil
.
buildOSInfo
())
.
build
());
.
build
());
needRegisterRecover
=
false
;
}
else
{
}
else
{
if
(
lastSegmentTime
-
System
.
currentTimeMillis
()
>
60
*
1000
)
{
if
(
lastSegmentTime
-
System
.
currentTimeMillis
()
>
60
*
1000
)
{
instanceDiscoveryServiceBlockingStub
.
heartbeat
(
ApplicationInstanceHeartbeat
.
newBuilder
()
instanceDiscoveryServiceBlockingStub
.
heartbeat
(
ApplicationInstanceHeartbeat
.
newBuilder
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录