支持解析返回压缩http请求

Author: c-wind

http/client/client.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"bytes"
+	"compress/gzip"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -109,7 +110,22 @@ func (c HTTPClient) do(method, url string, headers map[string]string, body []byt
 	}
 	defer resp.Body.Close()
 
-	data, err := ioutil.ReadAll(resp.Body)
+	c.logger.Errorf("url:%v, response header:%#v", url, resp.Header)
+
+	var data []byte
+
+	switch resp.Header.Get("Content-Encoding") {
+	case "gzip":
+		gr, err := gzip.NewReader(resp.Body)
+		if err != nil {
+			return nil, errors.Trace(err)
+		}
+		data, err = ioutil.ReadAll(gr)
+		gr.Close()
+	default:
+		data, err = ioutil.ReadAll(resp.Body)
+	}
+
 	if err != nil {
 		return nil, errors.Trace(err)
 	}

http/client/client_test.go

@@ -1,12 +1,23 @@
 package client
 
 import (
+	"github.com/dearcode/crab/log"
 	"testing"
 )
 
+func TestHTTPClientZIP(t *testing.T) {
+	hc := New().SetLogger(log.GetLogger()).Timeout(1)
+	buf, err := hc.Get("http://www.baidu.com/", map[string]string{"Accept-Encoding": "gzip"}, nil)
+	if err != nil {
+		t.Fatalf("err:%v", err)
+	}
+
+	t.Logf("buf:%s", buf)
+}
+
 func TestHTTPClient(t *testing.T) {
-	hc := New().Timeout(1)
-	buf, err := hc.Get("http://baidu.com/", nil, nil)
+	hc := New().SetLogger(log.GetLogger()).Timeout(1)
+	buf, err := hc.Get("http://www.baidu.com/", nil, nil)
 	if err != nil {
 		t.Fatalf("err:%v", err)
 	}

log/writer.go

@@ -129,6 +129,9 @@ func (l *Logger) rotate(now time.Time) {
 }
 
 func (l *Logger) write(t Level, format string, argv ...interface{}) {
+    if l == nil {
+        return
+    }
 	if t > l.level {
 		return
 	}