diff --git a/main.go b/main.go index bf8df0a5c..d458d1f98 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,6 @@ import ( "net/http" "strconv" "time" - "code.google.com/p/go.net/context" etcdserver "github.com/coreos/etcd/etcdserver2" "github.com/coreos/etcd/etcdserver2/etcdhttp" @@ -39,16 +38,15 @@ func main() { log.Fatalf("%d= must be specified in peers", id) } - n := raft.Start(id, peers.Ids()) - - ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) - n.Campaign(ctx) + n := raft.Start(id, peers.Ids(), 10, 1) + tk := time.NewTicker(100 * time.Millisecond) s := &etcdserver.Server{ - Store: store.New(), - Node: n, - Save: func(st raftpb.State, ents []raftpb.Entry) {}, // TODO: use wal - Send: etcdhttp.Sender(peers), + Store: store.New(), + Node: n, + Save: func(st raftpb.State, ents []raftpb.Entry) {}, // TODO: use wal + Send: etcdhttp.Sender(peers), + Ticker: tk.C, } etcdserver.Start(s) h := &etcdhttp.Handler{