Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-03-02 03:04:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化日志

Browse Source
This commit is contained in:
boyce
2025-12-12 10:52:08 +08:00
parent 210a3fa982
commit 857e3c4311
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/cluster.go
View File

@@ -26,8 +26,6 @@ const (
Discard NodeStatus = 1 //丢弃 Discard NodeStatus = 1 //丢弃
) )
// AllowDiscovery 允许发现的网络服务 // AllowDiscovery 允许发现的网络服务
type AllowDiscovery struct { type AllowDiscovery struct {
MasterNodeId string // 支持正则表达式 MasterNodeId string // 支持正则表达式
@@ -229,9 +227,9 @@ func (cls *Cluster) serviceDiscoverySetNodeInfo(nodeInfo *NodeInfo) {
} }
cls.mapRpc[nodeInfo.NodeId] = &rpcInfo cls.mapRpc[nodeInfo.NodeId] = &rpcInfo
if cls.IsNatsMode() == true || cls.discoveryInfo.discoveryType != OriginType { if cls.IsNatsMode() == true || cls.discoveryInfo.discoveryType != OriginType {
log.Info("Discovery nodeId and new rpc client", log.String("NodeId", nodeInfo.NodeId), log.Any("services:", nodeInfo.PublicServiceList), log.Bool("Retire", nodeInfo.Retire)) log.Info("Discovery node and new rpc client", log.String("NodeId", nodeInfo.NodeId), log.Any("services:", nodeInfo.PublicServiceList), log.Bool("Retire", nodeInfo.Retire))
} else { } else {
log.Info("Discovery nodeId and new rpc client", log.String("NodeId", nodeInfo.NodeId), log.Any("services:", nodeInfo.PublicServiceList), log.Bool("Retire", nodeInfo.Retire), log.String("nodeListenAddr", nodeInfo.ListenAddr)) log.Info("Discovery node and new rpc client", log.String("NodeId", nodeInfo.NodeId), log.Any("services:", nodeInfo.PublicServiceList), log.Bool("Retire", nodeInfo.Retire), log.String("nodeListenAddr", nodeInfo.ListenAddr))
} }
} }
@@ -515,7 +513,6 @@ func (cls *Cluster) CanDiscoveryService(fromNetworkName string,fromMasterNodeId
} }
} }
// 如果配置了服务，则匹配之 // 如果配置了服务，则匹配之
if len(serviceList) > 0 { if len(serviceList) > 0 {
hasService := false hasService := false
@@ -542,6 +539,5 @@ func (cls *Cluster) CanDiscoveryService(fromNetworkName string,fromMasterNodeId
} }
} }
return canDiscovery return canDiscovery
} }