mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-04 01:06:36 +08:00
fix: load probe target with tunnel record
This commit is contained in:
@@ -242,7 +242,7 @@ func (p *tunnelQualityProber) probeTunnel(tunnelID int64) {
|
||||
pingTimeoutMS: tunnelQualityPingTimeoutMs,
|
||||
timeoutMessage: "探测超时",
|
||||
}
|
||||
probeTarget := p.probeTargetForTunnel(tunnelID)
|
||||
probeTarget := effectiveTunnelProbeTargetValues(tunnel.ProbeTargetHost, tunnel.ProbeTargetPort)
|
||||
p.probeBestExitOwners(tunnelID, inNodes, midNodesGrouped, outNodes, ipPreference, options, probeTarget)
|
||||
|
||||
switch tunnel.Type {
|
||||
@@ -422,22 +422,6 @@ func (p *tunnelQualityProber) probeBestExitOwners(tunnelID int64, inNodes []chai
|
||||
}
|
||||
}
|
||||
|
||||
func (p *tunnelQualityProber) probeTargetForTunnel(tunnelID int64) tunnelProbeTarget {
|
||||
if p == nil || p.handler == nil || p.handler.repo == nil {
|
||||
return defaultTunnelProbeTarget()
|
||||
}
|
||||
tunnels, err := p.handler.repo.ListTunnels()
|
||||
if err != nil {
|
||||
return defaultTunnelProbeTarget()
|
||||
}
|
||||
for _, tunnel := range tunnels {
|
||||
if asInt64(tunnel["id"], 0) == tunnelID {
|
||||
return effectiveTunnelProbeTargetValues(asString(tunnel["probeTargetHost"]), asInt(tunnel["probeTargetPort"], 0))
|
||||
}
|
||||
}
|
||||
return defaultTunnelProbeTarget()
|
||||
}
|
||||
|
||||
func (p *tunnelQualityProber) tcpPingNode(nodeID int64, ip string, port int, options diagnosisExecOptions) (latency float64, loss float64, err error) {
|
||||
h := p.handler
|
||||
if h == nil {
|
||||
|
||||
Reference in New Issue
Block a user