From 4498a02c1555490b477767bf7a0eef4de28ab926 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 01:23:18 +0800 Subject: [PATCH 01/10] better go style --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 935b7a71..ab734b3c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false, true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From e1d20aea5d0d270304bbdac7c72277b25d4c2e9d Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:04:34 +0800 Subject: [PATCH 02/10] better code and fixed --- httplib/httplib.go | 53 +++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ab734b3c..ca893163 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -85,7 +85,14 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil, nil} + return &BeegoHttpRequest{ + url: url, + req: &req, + paras: map[string]string{}, + files: map[string]string{}, + setting: defaultSetting, + resp: &resp, + } } // Get returns *BeegoHttpRequest with GET method. @@ -157,14 +164,14 @@ func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { - b.setting.UserAgent = useragent +func (b *BeegoHttpRequest) SetUserAgent(userAgent string) *BeegoHttpRequest { + b.setting.UserAgent = userAgent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { - b.setting.ShowDebug = isdebug +func (b *BeegoHttpRequest) Debug(isDebug bool) *BeegoHttpRequest { + b.setting.ShowDebug = isDebug return b } @@ -409,12 +416,8 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { b.dump = dump } - resp, err := client.Do(b.req) - if err != nil { - return nil, err - } - b.resp = resp - return resp, nil + b.resp, err = client.Do(b.req) + return b.resp, err } // String returns the body string in response. @@ -435,12 +438,9 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return b.body, nil } resp, err := b.getResponse() - if err != nil { + if resp == nil || resp.Body == nil { return nil, err } - if resp.Body == nil { - return nil, nil - } defer resp.Body.Close() if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { reader, err := gzip.NewReader(resp.Body) @@ -451,29 +451,24 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { } else { b.body, err = ioutil.ReadAll(resp.Body) } - if err != nil { - return nil, err - } - return b.body, nil + return b.body, err } // ToFile saves the body data in response to one file. // it calls Response inner. func (b *BeegoHttpRequest) ToFile(filename string) error { + resp, err := b.getResponse() + if resp == nil || resp.Body == nil { + return err + } + defer resp.Body.Close() + f, err := os.Create(filename) if err != nil { return err } defer f.Close() - resp, err := b.getResponse() - if err != nil { - return err - } - if resp.Body == nil { - return nil - } - defer resp.Body.Close() _, err = io.Copy(f, resp.Body) return err } @@ -510,7 +505,7 @@ func TimeoutDialer(cTimeout time.Duration, rwTimeout time.Duration) func(net, ad if err != nil { return nil, err } - conn.SetDeadline(time.Now().Add(rwTimeout)) - return conn, nil + err = conn.SetDeadline(time.Now().Add(rwTimeout)) + return conn, err } } From cddb4fdb609715664ae0d10987fa2ae3461f9277 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:05:50 +0800 Subject: [PATCH 03/10] typo fixed --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ca893163..502ef276 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From 0c1bb6409a86dbb77ac5f90ecad7e8737da93742 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:06:19 +0800 Subject: [PATCH 04/10] typo fixed --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 502ef276..6e0acdab 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex @@ -88,7 +88,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - paras: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, From da8c3c39103bee08796f89a9ef47071839b06373 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:17:46 +0800 Subject: [PATCH 05/10] zero timeout means wait until resp --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 6e0acdab..140d541b 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -65,14 +65,8 @@ func createDefaultCookie() { // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { settingMutex.Lock() - defer settingMutex.Unlock() defaultSetting = setting - if defaultSetting.ConnectTimeout == 0 { - defaultSetting.ConnectTimeout = 60 * time.Second - } - if defaultSetting.ReadWriteTimeout == 0 { - defaultSetting.ReadWriteTimeout = 60 * time.Second - } + settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -262,11 +256,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From 973306b28ddba2b27a9fb63036d073c51347ea4a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:19:38 +0800 Subject: [PATCH 06/10] no need defer here --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 140d541b..f84586a5 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -58,8 +58,8 @@ var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { settingMutex.Lock() - defer settingMutex.Unlock() defaultCookieJar, _ = cookiejar.New(nil) + settingMutex.Unlock() } // Overwrite default settings From 0afd04ec6f8e4420f880be81a7a2b69d773d0e52 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:24:04 +0800 Subject: [PATCH 07/10] no need lock here --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index f84586a5..54c70283 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -47,26 +47,20 @@ import ( "net/url" "os" "strings" - "sync" "time" ) var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar -var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { - settingMutex.Lock() defaultCookieJar, _ = cookiejar.New(nil) - settingMutex.Unlock() } // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { - settingMutex.Lock() defaultSetting = setting - settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -82,7 +76,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - params: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, @@ -256,11 +250,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From d8fa118727d40238e03a2ec700bc05e53285a6f2 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:42:10 +0800 Subject: [PATCH 08/10] more fixed --- httplib/httplib.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 54c70283..ae50791c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -36,6 +36,7 @@ import ( "crypto/tls" "encoding/json" "encoding/xml" + "fmt" "io" "io/ioutil" "log" @@ -278,12 +279,15 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) } func (b *BeegoHttpRequest) buildUrl(paramBody string) { + if paramBody == "" { + return + } // build GET url with query string - if b.req.Method == "GET" && len(paramBody) > 0 { - if strings.Index(b.url, "?") != -1 { - b.url += "&" + paramBody - } else { + if b.req.Method == "GET" { + if strings.Index(b.url, "?") == -1 { b.url = b.url + "?" + paramBody + } else { + b.url += "&" + paramBody } return } @@ -336,18 +340,14 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { } var paramBody string if len(b.params) > 0 { - var buf bytes.Buffer for k, v := range b.params { - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(v)) - buf.WriteByte('&') + paramBody += fmt.Sprintf("&%s=%v", url.QueryEscape(k), url.QueryEscape(v)) } - paramBody = buf.String() - paramBody = paramBody[0 : len(paramBody)-1] + paramBody = paramBody[1:] } b.buildUrl(paramBody) + url, err := url.Parse(b.url) if err != nil { return nil, err @@ -399,7 +399,7 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if b.setting.ShowDebug { dump, err := httputil.DumpRequest(b.req, true) if err != nil { - println(err.Error()) + log.Println(err.Error()) } b.dump = dump } From f56bdb628448d7dac14eabede88e3351a415dc92 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:08:25 +0800 Subject: [PATCH 09/10] set default timeout --- httplib/httplib.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index ae50791c..7464c16f 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -357,6 +357,13 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport + if b.setting.ConnectTimeout == 0 { + b.setting.ConnectTimeout = 30 * time.Second + } + if b.setting.ReadWriteTimeout == 0 { + b.setting.ReadWriteTimeout = 30 * time.Second + } + if trans == nil { // create default transport trans = &http.Transport{ From 6c3e274b6ec143a3325c185247a8da8459d0925c Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:10:18 +0800 Subject: [PATCH 10/10] set default timeout --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 7464c16f..2389a7cb 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -358,10 +358,10 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport if b.setting.ConnectTimeout == 0 { - b.setting.ConnectTimeout = 30 * time.Second + b.setting.ConnectTimeout = 60 * time.Second } if b.setting.ReadWriteTimeout == 0 { - b.setting.ReadWriteTimeout = 30 * time.Second + b.setting.ReadWriteTimeout = 60 * time.Second } if trans == nil {