proxy: add new env: FORWARDER_URL to script health check (#310)

This commit is contained in:
nadoo committed 2022-01-27 12:42:49 +08:00
1 parent fac4b86f60
commit 9b2f00f4c8
7 files changed
+21 -15

No files matched your search

+8 -8
View File
@@ -13,12 +13,11 @@ import (
"time"
"github.com/nadoo/glider/pkg/pool"
"github.com/nadoo/glider/proxy"
)
// Checker is a forwarder health checker.
type Checker interface {
Check(dialer proxy.Dialer) (elap time.Duration, err error)
Check(fwdr *Forwarder) (elap time.Duration, err error)
}
type tcpChecker struct {
@@ -34,9 +33,9 @@ func newTcpChecker(addr string, timeout time.Duration) *tcpChecker {
}
// Check implements the Checker interface.
func (c *tcpChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
func (c *tcpChecker) Check(fwdr *Forwarder) (time.Duration, error) {
startTime := time.Now()
rc, err := dialer.Dial("tcp", c.addr)
rc, err := fwdr.Dial("tcp", c.addr)
if err != nil {
return 0, err
}
@@ -80,9 +79,9 @@ func newHttpChecker(addr, uri, expect string, timeout time.Duration, withTLS boo
}
// Check implements the Checker interface.
func (c *httpChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
func (c *httpChecker) Check(fwdr *Forwarder) (time.Duration, error) {
startTime := time.Now()
rc, err := dialer.Dial("tcp", c.addr)
rc, err := fwdr.Dial("tcp", c.addr)
if err != nil {
return 0, err
}
@@ -131,10 +130,11 @@ type fileChecker struct{ path string }
func newFileChecker(path string) *fileChecker { return &fileChecker{path} }
// Check implements the Checker interface.
func (c *fileChecker) Check(dialer proxy.Dialer) (time.Duration, error) {
func (c *fileChecker) Check(fwdr *Forwarder) (time.Duration, error) {
cmd := exec.Command(c.path)
cmd.Stdout = os.Stdout
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, "FORWARDER_ADDR="+dialer.Addr())
cmd.Env = append(cmd.Env, "FORWARDER_ADDR="+fwdr.Addr())
cmd.Env = append(cmd.Env, "FORWARDER_URL="+fwdr.URL())
return 0, cmd.Run()
}
+7 -1
View File
@@ -18,6 +18,7 @@ type StatusHandler func(*Forwarder)
// Forwarder associates with a `-forward` command, usually a dialer or a chain of dialers.
type Forwarder struct {
proxy.Dialer
url string
addr string
priority uint32
maxFailures uint32 // maxfailures to set to Disabled
@@ -30,7 +31,7 @@ type Forwarder struct {
// ForwarderFromURL parses `forward=` command value and returns a new forwarder.
func ForwarderFromURL(s, intface string, dialTimeout, relayTimeout time.Duration) (f *Forwarder, err error) {
f = &Forwarder{}
f = &Forwarder{url: s}
ss := strings.Split(s, "#")
if len(ss) > 1 {
@@ -107,6 +108,11 @@ func (f *Forwarder) Addr() string {
return f.addr
}
// URL returns the forwarder's full url.
func (f *Forwarder) URL() string {
return f.url
}
// Dial dials to addr and returns conn.
func (f *Forwarder) Dial(network, addr string) (c net.Conn, err error) {
c, err = f.Dialer.Dial(network, addr)