diff --git a/main.go b/main.go index b214cfe..48b64ff 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( "syscall" ) -const version = "0.1" +const version = "0.1.1" var config struct { Verbose bool diff --git a/mixed.go b/mixed.go index a9a739c..e063cba 100644 --- a/mixed.go +++ b/mixed.go @@ -25,7 +25,7 @@ type mixedproxy struct { ss Proxy } -// MixedProxy returns a http mixed proxy. +// MixedProxy returns a mixed proxy. func MixedProxy(network, addr, user, pass string, upProxy Proxy) (Proxy, error) { p := &mixedproxy{ Proxy: upProxy, diff --git a/proxy.go b/proxy.go index 0c5c8c8..ba30ca9 100644 --- a/proxy.go +++ b/proxy.go @@ -138,15 +138,17 @@ func check(p Proxy, target string, duration int) { } firstTime = false + startTime := time.Now() c, err := p.Dial("tcp", target) if err != nil { - logf("proxy %s check error: %s, set to disabled.", p.Addr(), err) + logf("proxy-check %s -> %s, error: %s, set to disabled.", p.Addr(), config.CheckSite, err) p.SetEnable(false) continue } + dialTime := time.Since(startTime) c.Close() p.SetEnable(true) - logf("proxy %s check ok.", p.Addr()) + logf("proxy-check: %s -> %s, connect time: %d", p.Addr(), config.CheckSite, dialTime) } } diff --git a/strategy.go b/strategy.go index c094716..e09541e 100644 --- a/strategy.go +++ b/strategy.go @@ -74,7 +74,7 @@ type haproxy struct { // newHAProxy . func newHAProxy(addr string, forwarders []Proxy) Proxy { - return newStrategyProxy(addr, forwarders) + return &haproxy{Proxy: newStrategyProxy(addr, forwarders)} } func (p *haproxy) GetProxy() Proxy {