Skip to content

Commit

Permalink
fix: reigistryTimeout -> registryTimeout to fix start fail
Browse files Browse the repository at this point in the history
  • Loading branch information
ypingcn committed Sep 28, 2018
1 parent 5dc623d commit 596db8e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion AdminRegistryServer/AdminReapThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int AdminReapThread::init()
_updateInterval = _updateInterval < 5 ? 5 : _updateInterval;

//管理主控心跳超时时间
_timeout = TC_Common::strto<int>((*g_pconf)["/tars/reap<reigistryTimeout>"]);
_timeout = TC_Common::strto<int>((*g_pconf)["/tars/reap<registryTimeout>"]);
_timeout = _timeout < 5 ? 5 : _timeout;

//是否关闭更新管理主控心跳时间,一般需要迁移时,设置此项为Y
Expand Down
2 changes: 1 addition & 1 deletion RegistryServer/ReapThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int ReapThread::init()
_loadObjectsInterval2 = TC_Common::strto<int>((*g_pconf).get("/tars/reap<loadObjectsInterval2>", "300"));

//主控心跳超时时间
_registryTimeout = TC_Common::strto<int>((*g_pconf)["/tars/reap<reigistryTimeout>"]);
_registryTimeout = TC_Common::strto<int>((*g_pconf)["/tars/reap<registryTimeout>"]);

//是否启用DB恢复保护功能
_recoverProtect = (*g_pconf).get("/tars/reap<recoverProtect>", "Y") == "N"?false:true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@
</nodeinfo>
<reap>
updateHeartInterval=15
reigistryTimeout=150
registryTimeout=150
</reap>
</tars>
4 changes: 2 additions & 2 deletions deploy/tarsregistry/conf/tars.tarsregistry.config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<reap>
#加载object间隔时间(s)
loadObjectsInterval = 30
reigistryTimeout = 150
registryTimeout = 150
#node心跳超时时间(s)
nodeTimeout = 250
#轮询server状态的间隔时间(s)
Expand All @@ -70,7 +70,7 @@
#node心跳超时时间,单位是秒
nodeTimeout = 250
#主控心跳超时检测时间,单位是秒
reigistryTimeout = 150
registryTimeout = 150

#服务状态监控时间,单位是秒
queryInterval = 150
Expand Down

0 comments on commit 596db8e

Please sign in to comment.