Merge pull request #13 from qiniu/develop

Release v7.0.6 - qiniupkg.com/x/{config.v7, rpc.v7/gob}

Author: xushiwei

README.md

@@ -12,9 +12,11 @@ go get qiniupkg.com/x
 # 使用文档
 
 * [qiniupkg.com/x/bytes.v7](http://godoc.org/qiniupkg.com/x/bytes.v7)
+* [qiniupkg.com/x/config.v7](http://godoc.org/qiniupkg.com/x/config.v7)
 * [qiniupkg.com/x/ctype.v7](http://godoc.org/qiniupkg.com/x/ctype.v7)
 * [qiniupkg.com/x/log.v7](http://godoc.org/qiniupkg.com/x/log.v7)
 * [qiniupkg.com/x/reqid.v7](http://godoc.org/qiniupkg.com/x/reqid.v7)
 * [qiniupkg.com/x/rpc.v7](http://godoc.org/qiniupkg.com/x/rpc.v7)
+* [qiniupkg.com/x/rpc.v7/gob](http://godoc.org/qiniupkg.com/x/rpc.v7/gob)
 * [qiniupkg.com/x/url.v7](http://godoc.org/qiniupkg.com/x/url.v7)
 * [qiniupkg.com/x/xlog.v7](http://godoc.org/qiniupkg.com/x/xlog.v7)

config.v7/getdir.go

@@ -0,0 +1,41 @@
+package config
+
+import (
+	"errors"
+	"os"
+)
+
+var homeEnvNames = [][]string{
+	{"HOME"},
+	{"HOMEDRIVE", "HOMEPATH"},
+}
+
+var (
+	ErrHomeNotFound = errors.New("$HOME not found")
+)
+
+func getEnv(name []string) (v string) {
+
+	if len(name) == 1 {
+		return os.Getenv(name[0])
+	}
+	for _, k := range name {
+		v += os.Getenv(k)
+	}
+	return
+}
+
+func GetDir(app string) (dir string, err error) {
+
+	for _, name := range homeEnvNames {
+		home := getEnv(name)
+		if home == "" {
+			continue
+		}
+		dir = home + "/." + app
+		err = os.MkdirAll(dir, 0777)
+		return
+	}
+	return "", ErrHomeNotFound
+}
+

config.v7/load_conf.go

@@ -0,0 +1,116 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"io/ioutil"
+
+	"qiniupkg.com/x/log.v7"
+)
+
+var (
+	confName *string
+)
+
+func Init(cflag, app, default_conf string) {
+
+	confDir, _ := GetDir(app)
+	confName = flag.String(cflag, confDir+"/"+default_conf, "the config file")
+}
+
+func GetPath() string {
+
+	if confName != nil {
+		return *confName
+	}
+	return ""
+}
+
+func Load(conf interface{}) (err error) {
+
+	if !flag.Parsed() {
+		flag.Parse()
+	}
+
+	log.Info("Use the config file of ", *confName)
+	return LoadEx(conf, *confName)
+}
+
+func LoadEx(conf interface{}, confName string) (err error) {
+
+	data, err := ioutil.ReadFile(confName)
+	if err != nil {
+		log.Error("Load conf failed:", err)
+		return
+	}
+	data = trimComments(data)
+
+	err = json.Unmarshal(data, conf)
+	if err != nil {
+		log.Error("Parse conf failed:", err)
+	}
+	return
+}
+
+func LoadFile(conf interface{}, confName string) (err error) {
+
+	data, err := ioutil.ReadFile(confName)
+	if err != nil {
+		return
+	}
+	data = trimComments(data)
+
+	return json.Unmarshal(data, conf)
+}
+
+func LoadBytes(conf interface{}, data []byte) (err error) {
+
+	return json.Unmarshal(trimComments(data), conf)
+}
+
+func LoadString(conf interface{}, data string) (err error) {
+
+	return json.Unmarshal(trimComments([]byte(data)), conf)
+}
+
+func trimComments(data []byte) (data1 []byte) {
+
+	var line []byte
+
+	data1 = data[:0]
+	for {
+		pos := bytes.IndexByte(data, '\n')
+		if pos < 0 {
+			line = data
+		} else {
+			line = data[:pos+1]
+		}
+		data1 = append(data1, trimCommentsLine(line)...)
+		if pos < 0 {
+			return
+		}
+		data = data[pos+1:]
+	}
+}
+
+func trimCommentsLine(line []byte) []byte {
+
+	n := len(line)
+	quoteCount := 0
+	for i := 0; i < n; i++ {
+		c := line[i]
+		switch c {
+		case '\\':
+			i++
+		case '"':
+			quoteCount++
+		case '#':
+			if (quoteCount&1) == 0 {
+				return line[:i]
+			}
+		}
+	}
+	return line
+}
+

config.v7/load_conf_test.go

@@ -0,0 +1,59 @@
+package config_test
+
+import (
+	"bytes"
+	"encoding/json"
+	"testing"
+
+	"qiniupkg.com/x/config.v7"
+)
+
+func TestTrimComments(t *testing.T) {
+
+	confData := `{
+    "debug_level": 0, # 调试级别
+    "rs_host": "http://localhost:15001", #RS服务
+    "limit": 5, #限制数
+    "retryTimes": 56,
+    "quote0": "###",
+    "quote": "quo\\\"\\#",
+    "ant": "ant\\#" #123
+}`
+
+	confDataExp := `{
+    "debug_level": 0,
+    "rs_host": "http://localhost:15001",
+    "limit": 5,
+    "retryTimes": 56,
+    "quote0": "###",
+    "quote": "quo\\\"\\#",
+    "ant": "ant\\#"
+}`
+
+	var (
+		conf, confExp interface{}
+	)
+	err := config.LoadString(&conf, confData)
+	if err != nil {
+		t.Fatal("config.LoadString(conf) failed:", err)
+	}
+	err = config.LoadString(&confExp, confDataExp)
+	if err != nil {
+		t.Fatal("config.LoadString(confExp) failed:", err)
+	}
+
+	b, err := json.Marshal(conf)
+	if err != nil {
+		t.Fatal("json.Marshal failed:", err)
+	}
+
+	bExp, err := json.Marshal(confExp)
+	if err != nil {
+		t.Fatal("json.Marshal(exp) failed:", err)
+	}
+
+	if !bytes.Equal(b, bExp) {
+		t.Fatal("b != bExp")
+	}
+}
+

rpc.v7/gob/gobrpc_client.go

@@ -0,0 +1,107 @@
+package gob
+
+import (
+	"bytes"
+	"encoding/gob"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+
+	"qiniupkg.com/x/rpc.v7"
+
+	. "golang.org/x/net/context"
+)
+
+// ---------------------------------------------------------------------------
+
+func Register(value interface{}) {
+
+	gob.Register(value)
+}
+
+func RegisterName(name string, value interface{}) {
+
+	gob.RegisterName(name, value)
+}
+
+// ---------------------------------------------------------------------------
+
+func ResponseError(resp *http.Response) (err error) {
+
+	e := &rpc.ErrorInfo{
+		Reqid: resp.Header.Get("X-Reqid"),
+		Code:  resp.StatusCode,
+	}
+	if resp.StatusCode > 299 {
+		e.Err = resp.Header.Get("X-Err")
+		if errno := resp.Header.Get("X-Errno"); errno != "" {
+			v, err2 := strconv.ParseInt(errno, 10, 32)
+			if err2 != nil {
+				e.Err = err2.Error()
+			}
+			e.Errno = int(v)
+		}
+	}
+	return e
+}
+
+func CallRet(ctx Context, ret interface{}, resp *http.Response) (err error) {
+
+	defer func() {
+		io.Copy(ioutil.Discard, resp.Body)
+		resp.Body.Close()
+	}()
+
+	if resp.StatusCode/100 == 2 {
+		if ret != nil && resp.ContentLength != 0 {
+			err = gob.NewDecoder(resp.Body).Decode(ret)
+			if err != nil {
+				return
+			}
+		}
+		if resp.StatusCode == 200 {
+			return nil
+		}
+	}
+	return ResponseError(resp)
+}
+
+// ---------------------------------------------------------------------------
+
+type Client struct {
+	rpc.Client
+}
+
+var (
+	DefaultClient = Client{rpc.DefaultClient}
+)
+
+func (r Client) Call(
+	ctx Context, ret interface{}, method, url1 string) (err error) {
+
+	resp, err := r.DoRequestWith(ctx, method, url1, "application/gob", nil, 0)
+	if err != nil {
+		return err
+	}
+	return CallRet(ctx, ret, resp)
+}
+
+func (r Client) CallWithGob(
+	ctx Context, ret interface{}, method, url1 string, params interface{}) (err error) {
+
+	var b bytes.Buffer
+	err = gob.NewEncoder(&b).Encode(params)
+	if err != nil {
+		return err
+	}
+
+	resp, err := r.DoRequestWith(ctx, method, url1, "application/gob", &b, b.Len())
+	if err != nil {
+		return err
+	}
+	return CallRet(ctx, ret, resp)
+}
+
+// ---------------------------------------------------------------------------
+