opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gofmt

Browse Source
This commit is contained in:
yangzhouhan
2015-08-10 11:01:15 -07:00
parent 2911d760f4
commit 86b5db2f22
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
naming/etcd/etcd.go
View File

@ -1,8 +1,8 @@
package etcd package etcd
import ( import (
"sync"
"log" "log"
"sync"
etcdcl "github.com/coreos/etcd/client" etcdcl "github.com/coreos/etcd/client"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -77,7 +77,7 @@ type etcdNR struct {
func NewETCDNR(cfg etcdcl.Config) naming.Resolver { func NewETCDNR(cfg etcdcl.Config) naming.Resolver {
c, err := etcdcl.New(cfg) c, err := etcdcl.New(cfg)
if err != nil { if err != nil {
log.Fatalf("NewETCDNR() failed: %v",err) log.Fatalf("NewETCDNR(_) failed: %v", err)
return nil return nil
} }
kAPI := etcdcl.NewKeysAPI(c) kAPI := etcdcl.NewKeysAPI(c)
@ -104,7 +104,7 @@ func getNode(node *etcdcl.Node, res map[string]string) {
func (nr *etcdNR) Get(target string) map[string]string { func (nr *etcdNR) Get(target string) map[string]string {
resp, err := nr.kAPI.Get(nr.ctx, target, &etcdcl.GetOptions{Recursive: true, Sort: true}) resp, err := nr.kAPI.Get(nr.ctx, target, &etcdcl.GetOptions{Recursive: true, Sort: true})
if err != nil { if err != nil {
log.Fatalf("etcdNR.Get(_) failed: %v", err) log.Printf("etcdNR.Get(_) stopped: %v", err)
return nil return nil
} }
res := make(map[string]string) res := make(map[string]string)
@ -117,7 +117,7 @@ func (nr *etcdNR) Watch(target string) {
for { for {
resp, err := watcher.Next(nr.ctx) resp, err := watcher.Next(nr.ctx)
if err != nil { if err != nil {
log.Printf("etcdNR.Watch() stopped: %v", err) log.Printf("etcdNR.Watch(_) stopped: %v", err)
break break
} }
if resp.Node.Dir { if resp.Node.Dir {
@ -130,12 +130,12 @@ func (nr *etcdNR) Watch(target string) {
func (nr *etcdNR) GetUpdate() (string, string) { func (nr *etcdNR) GetUpdate() (string, string) {
i := <-nr.recv.get() i := <-nr.recv.get()
nr.recv.load() nr.recv.load()
if i == nil { if i == nil {
return "", "" return "", ""
} }
// returns key and the corresponding value of the updated kv // returns key and the corresponding value of the updated kv pair
return i.key, i.value return i.key, i.value
} }