xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-11 22:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(node-sync): log the client-IP-attribution 404 once per node, not every cycle

Browse Source 
Old-build nodes lack panel/api/clients/clientIpsByGuid and answer 404 on every IP-sync cycle (~10s), which floods the debug log now that the IP phase actually runs. Note the missing endpoint once per node (re-armed if the node later recovers or is upgraded) and keep logging genuine fetch errors.
This commit is contained in:
MHSanaei
2026-06-22 15:39:54 +02:00
parent 98c9ba1f91
commit 846b8b338e
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/job/node_traffic_sync_job.go
+18 -5
View File
@@ -34,6 +34,9 @@ type NodeTrafficSyncJob struct {
lastIpSync int64 lastIpSync int64
globalPushMu sync.Mutex globalPushMu sync.Mutex
lastGlobalPush int64 lastGlobalPush int64
// noGuidIpEndpoint tracks nodes (by id) whose client-IP attribution endpoint
// returned 404, so an old-build node is noted once instead of every cycle.
noGuidIpEndpoint sync.Map
} }
type atomicBool struct { type atomicBool struct {
@@ -303,12 +306,22 @@ func (j *NodeTrafficSyncJob) syncOne(mgr *runtime.Manager, n *model.Node, doIpSy
// Per-node IP attribution: pull the node's guid-keyed subtree (its own // Per-node IP attribution: pull the node's guid-keyed subtree (its own
// observations plus any descendants) so the master can tell which node each // observations plus any descendants) so the master can tell which node each
// IP is on. Old nodes without the endpoint just return an error — skip them. // IP is on. Old nodes without the endpoint return HTTP 404 every cycle — note
// it once per node (re-armed on recovery) instead of flooding the log.
if guidTrees, err := rt.FetchClientIpsByGuid(ipCtx); err != nil { if guidTrees, err := rt.FetchClientIpsByGuid(ipCtx); err != nil {
logger.Debugf("node traffic sync: fetch client ip attribution from %s failed: %v", n.Name, err) if strings.Contains(err.Error(), "HTTP 404") {
} else if len(guidTrees) > 0 { if _, seen := j.noGuidIpEndpoint.LoadOrStore(n.Id, true); !seen {
if err := j.inboundService.MergeClientIpsByGuid(n, guidTrees); err != nil { logger.Debugf("node traffic sync: node %s has no client-IP attribution endpoint (old build)", n.Name)
logger.Warningf("node traffic sync: merge client ip attribution from %s failed: %v", n.Name, err) }
} else {
logger.Debugf("node traffic sync: fetch client ip attribution from %s failed: %v", n.Name, err)
}
} else {
j.noGuidIpEndpoint.Delete(n.Id)
if len(guidTrees) > 0 {
if err := j.inboundService.MergeClientIpsByGuid(n, guidTrees); err != nil {
logger.Warningf("node traffic sync: merge client ip attribution from %s failed: %v", n.Name, err)
}
} }
} }
} }