From 8c4e5025ed449f829f73ac6f0d837f3ee3a7b262 Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Fri, 30 Nov 2018 10:16:11 +0800 Subject: [PATCH] v6.6 --- config.go | 2 +- services/http/http.go | 1 - utils/structs.go | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config.go b/config.go index 4a892e4..cfbe9af 100755 --- a/config.go +++ b/config.go @@ -117,7 +117,7 @@ func initConfig() (err error) { httpArgs.ParentKey = http.Flag("parent-key", "the password for auto encrypt/decrypt parent connection data").Short('Z').Default("").String() httpArgs.LocalCompress = http.Flag("local-compress", "auto compress/decompress data on local connection").Short('m').Default("false").Bool() httpArgs.ParentCompress = http.Flag("parent-compress", "auto compress/decompress data on parent connection").Short('M').Default("false").Bool() - httpArgs.CloseIntelligent = http.Flag("close-intelligent", "Close intelligent HTTP, SOCKS5 proxy").Default("false").Bool() + httpArgs.CloseIntelligent = http.Flag("close-intelligent", "close intelligent HTTP, SOCKS5 proxy").Default("false").Bool() httpArgs.LoadBalanceMethod = http.Flag("lb-method", "load balance method when use multiple parent,can be ").Default("roundrobin").Enum("roundrobin", "weight", "leastconn", "leasttime", "hash") httpArgs.LoadBalanceTimeout = http.Flag("lb-timeout", "tcp milliseconds timeout of connecting to parent").Default("500").Int() httpArgs.LoadBalanceRetryTime = http.Flag("lb-retrytime", "sleep time milliseconds after checking").Default("1000").Int() diff --git a/services/http/http.go b/services/http/http.go index b6f60c5..37c62c5 100644 --- a/services/http/http.go +++ b/services/http/http.go @@ -186,7 +186,6 @@ func (s *HTTP) InitService() (err error) { s.InitBasicAuth() //init lb if len(*s.cfg.Parent) > 0 { - s.log.Printf("CloseIntelligent: %v", *s.cfg.CloseIntelligent) s.checker = utils.NewChecker(*s.cfg.HTTPTimeout, int64(*s.cfg.Interval), *s.cfg.Blocked, *s.cfg.Direct, s.log, *s.cfg.CloseIntelligent) s.InitLB() } diff --git a/utils/structs.go b/utils/structs.go index ef809aa..c3d84f6 100644 --- a/utils/structs.go +++ b/utils/structs.go @@ -44,13 +44,13 @@ type CheckerItem struct { //NewChecker args: //timeout : tcp timeout milliseconds ,connect to host //interval: recheck domain interval seconds -func NewChecker(timeout int, interval int64, blockedFile, directFile string, log *logger.Logger, CloseIntelligent bool) Checker { +func NewChecker(timeout int, interval int64, blockedFile, directFile string, log *logger.Logger, closeIntelligent bool) Checker { ch := Checker{ data: mapx.NewConcurrentMap(), interval: interval, timeout: timeout, isStop: false, - closeIntelligent: CloseIntelligent, + closeIntelligent: closeIntelligent, log: log, } ch.blockedMap = ch.loadMap(blockedFile)