TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-06-09 04:52:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed incorrect healthcheck result in some cases, healthchecker now send user agent identifying godoxy

Browse source
This commit is contained in:
yusing 2024-11-11 06:37:05 +08:00
parent ae69019265
commit 64728d10ad
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/docker/idlewatcher/waker.go
View file

@ -51,7 +51,7 @@ func newWaker(providerSubTask task.Task, entry entry.Entry, rp *gphttp.ReversePr
switch { switch {
case rp != nil: case rp != nil:
waker.hc = health.NewHTTPHealthChecker(entry.TargetURL(), hcCfg, rp.Transport) waker.hc = health.NewHTTPHealthChecker(entry.TargetURL(), hcCfg)
case stream != nil: case stream != nil:
waker.hc = health.NewRawHealthChecker(entry.TargetURL(), hcCfg) waker.hc = health.NewRawHealthChecker(entry.TargetURL(), hcCfg)
default: default:

22
internal/watcher/health/http.go
View file

@ -6,18 +6,27 @@ import (
"net/http" "net/http"
"github.com/yusing/go-proxy/internal/net/types" "github.com/yusing/go-proxy/internal/net/types"
"github.com/yusing/go-proxy/pkg"
) )
type HTTPHealthMonitor struct { type HTTPHealthMonitor struct {
*monitor *monitor
method string method string
pinger *http.Client
} }
func NewHTTPHealthMonitor(url types.URL, config *HealthCheckConfig, transport http.RoundTripper) *HTTPHealthMonitor { var pinger = &http.Client{
Transport: &http.Transport{
DisableKeepAlives: true,
ForceAttemptHTTP2: false,
},
CheckRedirect: func(r *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
},
}
func NewHTTPHealthMonitor(url types.URL, config *HealthCheckConfig) *HTTPHealthMonitor {
mon := new(HTTPHealthMonitor) mon := new(HTTPHealthMonitor)
mon.monitor = newMonitor(url, config, mon.CheckHealth) mon.monitor = newMonitor(url, config, mon.CheckHealth)
mon.pinger = &http.Client{Timeout: config.Timeout, Transport: transport}
if config.UseGet { if config.UseGet {
mon.method = http.MethodGet mon.method = http.MethodGet
} else { } else {
@ -26,8 +35,8 @@ func NewHTTPHealthMonitor(url types.URL, config *HealthCheckConfig, transport ht
return mon return mon
} }
func NewHTTPHealthChecker(url types.URL, config *HealthCheckConfig, transport http.RoundTripper) HealthChecker { func NewHTTPHealthChecker(url types.URL, config *HealthCheckConfig) HealthChecker {
return NewHTTPHealthMonitor(url, config, transport) return NewHTTPHealthMonitor(url, config)
} }
func (mon *HTTPHealthMonitor) CheckHealth() (healthy bool, detail string, err error) { func (mon *HTTPHealthMonitor) CheckHealth() (healthy bool, detail string, err error) {
@ -46,7 +55,8 @@ func (mon *HTTPHealthMonitor) CheckHealth() (healthy bool, detail string, err er
} }
req.Header.Set("Connection", "close") req.Header.Set("Connection", "close")
resp, respErr := mon.pinger.Do(req) req.Header.Set("User-Agent", "GoDoxy/"+pkg.GetVersion())
resp, respErr := pinger.Do(req)
if respErr == nil { if respErr == nil {
resp.Body.Close() resp.Body.Close()
} }