健康检查支持IPv6地址的节点

This commit is contained in:
GoEdgeLab
2021-09-13 13:46:20 +08:00
parent e4fb99e976
commit 762895ff2a

View File

@@ -8,6 +8,7 @@ import (
"github.com/TeaOSLab/EdgeAPI/internal/errors" "github.com/TeaOSLab/EdgeAPI/internal/errors"
"github.com/TeaOSLab/EdgeAPI/internal/remotelogs" "github.com/TeaOSLab/EdgeAPI/internal/remotelogs"
"github.com/TeaOSLab/EdgeAPI/internal/utils" "github.com/TeaOSLab/EdgeAPI/internal/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
@@ -185,11 +186,11 @@ func (this *HealthCheckExecutor) checkNode(healthCheckConfig *serverconfigs.Heal
if err != nil { if err != nil {
return nil, err return nil, err
} }
conn, err := net.Dial(network, result.NodeAddr+":"+port) conn, err := net.Dial(network, configutils.QuoteIP(result.NodeAddr)+":"+port)
if err == nil { if err == nil {
return conn, nil return conn, nil
} }
return net.DialTimeout(network, result.NodeAddr+":"+port, timeout) return net.DialTimeout(network, configutils.QuoteIP(result.NodeAddr)+":"+port, timeout)
}, },
MaxIdleConns: 1, MaxIdleConns: 1,
MaxIdleConnsPerHost: 1, MaxIdleConnsPerHost: 1,