From c1e7a788cd5e1595e169a9297f0567dc89b4bc13 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 4 Sep 2014 10:11:32 -0700 Subject: [PATCH 1/2] etcdserver: add default peer --- etcdserver/etcdhttp/http.go | 2 +- main.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index a03d918ca..a7919f202 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -18,13 +18,13 @@ import ( crand "crypto/rand" "math/rand" - "github.com/coreos/etcd/third_party/code.google.com/p/go.net/context" "github.com/coreos/etcd/elog" etcderrors "github.com/coreos/etcd/error" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/store" + "github.com/coreos/etcd/third_party/code.google.com/p/go.net/context" ) type Peers map[int64][]string diff --git a/main.go b/main.go index bc0854509..9201a8bd4 100644 --- a/main.go +++ b/main.go @@ -23,6 +23,7 @@ var ( ) func init() { + peers.Set("0xBEEF=localhost:8080") flag.Var(peers, "peers", "your peers") } From bca8f9e0ed6fc15b43c42b17aed83230800488c1 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 4 Sep 2014 22:26:42 -0700 Subject: [PATCH 2/2] etcdserver: change default id to 0x1 --- main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 9201a8bd4..da3162d07 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ import ( ) var ( - fid = flag.String("id", "0xBEEF", "Id of this server") + fid = flag.String("id", "0x1", "Id of this server") timeout = flag.Duration("timeout", 10*time.Second, "Request Timeout") laddr = flag.String("l", ":8080", "HTTP service address (e.g., ':8080')") @@ -23,7 +23,7 @@ var ( ) func init() { - peers.Set("0xBEEF=localhost:8080") + peers.Set("0x1=localhost:8080") flag.Var(peers, "peers", "your peers") }