Merge pull request #999 from coreos/fix_flag_set

etcdhttp: set peer should clean up previous values

etcdserver/etcdhttp/http.go

@@ -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,13 +50,20 @@ 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 {
-	return "todo"
+func (ps *Peers) String() string {
+	v := url.Values{}
+	for k, vv := range *ps {
+		for i := range vv {
+			v.Add(strconv.FormatInt(k, 16), vv[i])
+		}
+	}
+	return v.Encode()
 }
 
 func (ps Peers) Ids() []int64 {

etcdserver/etcdhttp/peers_test.go

@@ -0,0 +1,19 @@
+package etcdhttp
+
+import "testing"
+
+//TODO: full testing for peer set
+func TestPeerSet(t *testing.T) {
+	p := &Peers{}
+	tests := []string{
+		"1=1.1.1.1",
+		"2=2.2.2.2",
+		"1=1.1.1.1&1=1.1.1.2&2=2.2.2.2",
+	}
+	for i, tt := range tests {
+		p.Set(tt)
+		if p.String() != tt {
+			t.Errorf("#%d: string = %s, want %s", i, p.String(), tt)
+		}
+	}
+}

main.go

@@ -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)