vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdhttp: set peer should clean up previous values

release-2.0
Xiang Li 2014-09-05 11:59:23 -07:00
parent 9215ebb6aa
commit 5c8839387d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdserver/etcdhttp/http.go
View File

@ -39,7 +39,8 @@ func (ps Peers) Pick(id int64) string {
// Set parses command line sets of names to ips formatted like:
// a=1.1.1.1&a=1.1.1.2&b=2.2.2.2
func (ps Peers) Set(s string) error {
func (ps *Peers) Set(s string) error {
m := make(map[int64][]string)
v, err := url.ParseQuery(s)
if err != nil {
return err
@ -49,12 +50,13 @@ func (ps Peers) Set(s string) error {
if err != nil {
return err
}
ps[id] = v
m[id] = v
}
*ps = m
return nil
}
func (ps Peers) String() string {
func (ps *Peers) String() string {
return "todo"
}

5
main.go
View File

@ -27,7 +27,8 @@ var (
timeout = flag.Duration("timeout", 10*time.Second, "Request Timeout")
laddr = flag.String("l", ":8080", "HTTP service address (e.g., ':8080')")
dir = flag.String("data-dir", "", "Path to the data directory")
peers = etcdhttp.Peers{}
peers = &etcdhttp.Peers{}
)
func init() {
@ -62,7 +63,7 @@ func main() {
Store: store.New(),
Node: n,
Save: w.Save,
Send: etcdhttp.Sender(peers),
Send: etcdhttp.Sender(*peers),
Ticker: tk.C,
}
etcdserver.Start(s)