From 596db8e7f55ea761871614c7587e751987eb0721 Mon Sep 17 00:00:00 2001
From: ypingcn <1344632698@qq.com>
Date: Fri, 28 Sep 2018 15:03:59 +0800
Subject: [PATCH] fix: reigistryTimeout -> registryTimeout to fix start fail

---
 AdminRegistryServer/AdminReapThread.cpp                       | 2 +-
 RegistryServer/ReapThread.cpp                                 | 2 +-
 .../tarsAdminRegistry/conf/tars.tarsAdminRegistry.config.conf | 2 +-
 deploy/tarsregistry/conf/tars.tarsregistry.config.conf        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AdminRegistryServer/AdminReapThread.cpp b/AdminRegistryServer/AdminReapThread.cpp
index 3023a4fc..cb76084f 100644
--- a/AdminRegistryServer/AdminReapThread.cpp
+++ b/AdminRegistryServer/AdminReapThread.cpp
@@ -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
diff --git a/RegistryServer/ReapThread.cpp b/RegistryServer/ReapThread.cpp
index 033956a4..e403d6ff 100644
--- a/RegistryServer/ReapThread.cpp
+++ b/RegistryServer/ReapThread.cpp
@@ -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;
diff --git a/deploy/tarsAdminRegistry/conf/tars.tarsAdminRegistry.config.conf b/deploy/tarsAdminRegistry/conf/tars.tarsAdminRegistry.config.conf
index f4955308..57cad15b 100644
--- a/deploy/tarsAdminRegistry/conf/tars.tarsAdminRegistry.config.conf
+++ b/deploy/tarsAdminRegistry/conf/tars.tarsAdminRegistry.config.conf
@@ -57,6 +57,6 @@
 	  </nodeinfo>
 	  <reap>
 		    updateHeartInterval=15
-		    reigistryTimeout=150
+		    registryTimeout=150
 	  </reap>
 </tars>
diff --git a/deploy/tarsregistry/conf/tars.tarsregistry.config.conf b/deploy/tarsregistry/conf/tars.tarsregistry.config.conf
index 6b41c411..48db5bcf 100644
--- a/deploy/tarsregistry/conf/tars.tarsregistry.config.conf
+++ b/deploy/tarsregistry/conf/tars.tarsregistry.config.conf
@@ -53,7 +53,7 @@
     <reap>
         #加载object间隔时间(s)
         loadObjectsInterval = 30
-        reigistryTimeout    = 150
+        registryTimeout    = 150
         #node心跳超时时间(s)
         nodeTimeout         = 250
         #轮询server状态的间隔时间(s)
@@ -70,7 +70,7 @@
         #node心跳超时时间,单位是秒
         nodeTimeout         = 250
         #主控心跳超时检测时间,单位是秒
-        reigistryTimeout    = 150
+        registryTimeout    = 150
 
         #服务状态监控时间,单位是秒
         queryInterval       = 150