From 146cf4b74382d8cfe1b1370aa8cd29cf04626e2c Mon Sep 17 00:00:00 2001 From: anthoz69 Date: Sun, 13 May 2018 16:15:57 +0700 Subject: [PATCH 1/2] add example yaml readme --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index f4e3f04..77266ce 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,25 @@ func main() { http.ListenAndServe(addr, nil) } ``` + +## Example YAML +```go +package main + +import ( + "fmt" + "net/http" + + "github.com/acoshift/configfile" +) + +var config = configfile.NewReader("testdata/config.yaml") +// or use NewYAMLReader +var config = configfile.NewYAMLReader("testdata/config.yaml") + +log.Println(config.Bool("data1")) // true +log.Println(config.String("data2")) // false +log.Println(config.Int("data3")) // 9 +log.Println(config.Int("data4")) // 0 +log.Println(config.String("empty")) // "" +``` \ No newline at end of file From 4c703f4c74d7819f8acaa1ae681ee10379676754 Mon Sep 17 00:00:00 2001 From: anthoz69 Date: Sun, 13 May 2018 22:09:05 +0700 Subject: [PATCH 2/2] fix readme and lint md --- README.md | 89 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 77266ce..f83ba9e 100644 --- a/README.md +++ b/README.md @@ -14,67 +14,70 @@ Read config from file, useful when read data from kubernetes configmaps, and sec package main import ( - "fmt" - "net/http" + "fmt" + "net/http" - "github.com/acoshift/configfile" - "github.com/garyburd/redigo/redis" + "github.com/acoshift/configfile" + "github.com/garyburd/redigo/redis" ) var config = configfile.NewReader("config") var ( - addr = config.StringDefault("addr", ":8080") - redisAddr = config.MustString("redis_addr") - redisPass = config.String("redis_pass") - redisDB = config.Int("redis_db") + addr = config.StringDefault("addr", ":8080") + redisAddr = config.MustString("redis_addr") + redisPass = config.String("redis_pass") + redisDB = config.Int("redis_db") ) func main() { - pool := redis.Pool{ - Dial: func() (redis.Conn, error) { - return redis.Dial( - "tcp", - redisAddr, - redis.DialPassword(redisPass), - redis.DialDatabase(redisDB), - ) - }, - } - - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - c := pool.Get() - defer c.Close() - cnt, err := redis.Int64(c.Do("INCR", "cnt")) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - fmt.Fprintf(w, "count: %d", cnt) - }) - - http.ListenAndServe(addr, nil) + pool := redis.Pool{ + Dial: func() (redis.Conn, error) { + return redis.Dial( + "tcp", + redisAddr, + redis.DialPassword(redisPass), + redis.DialDatabase(redisDB), + ) + }, + } + + http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + c := pool.Get() + defer c.Close() + cnt, err := redis.Int64(c.Do("INCR", "cnt")) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintf(w, "count: %d", cnt) + }) + + http.ListenAndServe(addr, nil) } ``` ## Example YAML + ```go package main import ( - "fmt" - "net/http" + "fmt" + "net/http" - "github.com/acoshift/configfile" + "github.com/acoshift/configfile" ) -var config = configfile.NewReader("testdata/config.yaml") -// or use NewYAMLReader -var config = configfile.NewYAMLReader("testdata/config.yaml") - -log.Println(config.Bool("data1")) // true -log.Println(config.String("data2")) // false -log.Println(config.Int("data3")) // 9 -log.Println(config.Int("data4")) // 0 -log.Println(config.String("empty")) // "" +func main() { + var config = configfile.NewReader("testdata/config.yaml") + // or use NewYAMLReader + var config = configfile.NewYAMLReader("testdata/config.yaml") + + log.Println(config.Bool("data1")) // true + log.Println(config.String("data2")) // false + log.Println(config.Int("data3")) // 9 + log.Println(config.Int("data4")) // 0 + log.Println(config.String("empty")) // "" +} ``` \ No newline at end of file