11

RO_Server_Trunk-branch_0.1.39/rocommon/service/etcdreg.go

@@ -69,21 +69,21 @@ func ETCDRegister(node rocommon.ServerNode, opts ...interface{}) *ETCDServiceDes
 		}
 	}
 	//cross etcd
-	if crossEtcdDiscovery != nil {
-		//先查询是否存在相同的该节点，如果存在不做处理(或者通过del操作关闭其他客户端)
-		etcdKey := GenServicePrefix(sd.ID, property.GetZone())
-		rsp, err := crossEtcdDiscovery.EtcdKV.Get(context.TODO(), etcdKey)
-		if err != nil {
-			util.PanicF("etcd discovery get err:%v\n", err)
-		} else {
-			if rsp.Count > 0 {
-				util.PanicF("current node has been register to etcd:%v\n", etcdKey)
-			} else {
-				crossEtcdDiscovery.RegisterWithTimeOut(etcdKey, sd.String())
-				crossEtcdDiscovery.WatchSelf(etcdKey, *sd)
-			}
-		}
-	}
+	//if crossEtcdDiscovery != nil {
+	//	//先查询是否存在相同的该节点，如果存在不做处理(或者通过del操作关闭其他客户端)
+	//	etcdKey := GenServicePrefix(sd.ID, property.GetZone())
+	//	rsp, err := crossEtcdDiscovery.EtcdKV.Get(context.TODO(), etcdKey)
+	//	if err != nil {
+	//		util.PanicF("etcd discovery get err:%v\n", err)
+	//	} else {
+	//		if rsp.Count > 0 {
+	//			util.PanicF("current node has been register to etcd:%v\n", etcdKey)
+	//		} else {
+	//			crossEtcdDiscovery.RegisterWithTimeOut(etcdKey, sd.String())
+	//			crossEtcdDiscovery.WatchSelf(etcdKey, *sd)
+	//		}
+	//	}
+	//}
 
 	//添加服务器开服时间(server/zone)
 	InitServiceStartupTime(property.GetZone())