From 22c8ec0a80e443c582c56bd8934f563573f54af7 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake.mizerany@gmail.com>
Date: Tue, 2 Sep 2014 13:48:38 -0700
Subject: [PATCH] ...

---
 etcdserver2/etcdhttp/http.go      |  1 +
 etcdserver2/etcdhttp/http_test.go |  2 +-
 main.go                           | 83 +++++++++----------------------
 3 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/etcdserver2/etcdhttp/http.go b/etcdserver2/etcdhttp/http.go
index bb1faf2ad..929305ef4 100644
--- a/etcdserver2/etcdhttp/http.go
+++ b/etcdserver2/etcdhttp/http.go
@@ -66,6 +66,7 @@ func Sender(prefix string, p Peers) func(msgs []raftpb.Message) {
 }
 
 func httpPost(url string, data []byte) bool {
+	// TODO: set timeouts
 	resp, err := http.Post(url, "application/protobuf", bytes.NewBuffer(data))
 	if err != nil {
 		elog.TODO()
diff --git a/etcdserver2/etcdhttp/http_test.go b/etcdserver2/etcdhttp/http_test.go
index 08ac0f4cb..79e1a8125 100644
--- a/etcdserver2/etcdhttp/http_test.go
+++ b/etcdserver2/etcdhttp/http_test.go
@@ -26,7 +26,7 @@ func TestSet(t *testing.T) {
 
 	st := store.New()
 
-	n := raft.Start(ctx, 1, []int64{1})
+	n := raft.Start(1, []int64{1})
 	n.Campaign(ctx)
 
 	srv := &etcdserver.Server{
diff --git a/main.go b/main.go
index 2de8a1481..d02cda4ff 100644
--- a/main.go
+++ b/main.go
@@ -1,73 +1,36 @@
 package main
 
 import (
-	"crypto/tls"
-	"fmt"
+	"flag"
 	"log"
-	"net"
 	"net/http"
-	"os"
-	"time"
 
-	"github.com/coreos/etcd/conf"
-	"github.com/coreos/etcd/etcdserver"
+	etcdserver "github.com/coreos/etcd/etcdserver2"
+	"github.com/coreos/etcd/etcdserver2/etcdhttp"
+	"github.com/coreos/etcd/raft"
+	"github.com/coreos/etcd/raft/raftpb"
+)
+
+var (
+	id = flag.String("id", "default", "The id of this server")
 )
 
 func main() {
-	var cfg = conf.New()
-	if err := cfg.Load(os.Args[1:]); err != nil {
-		fmt.Println(etcdserver.Usage() + "\n")
-		fmt.Println(err.Error(), "\n")
-		os.Exit(1)
-	} else if cfg.ShowVersion {
-		fmt.Println("0.5")
-		os.Exit(0)
-	} else if cfg.ShowHelp {
-		os.Exit(0)
-	}
+	const V2Prefix = "/v2"
 
-	e, err := etcdserver.New(cfg)
-	if err != nil {
-		log.Fatal("etcd:", err)
+	peers := etcdhttp.Discover(V2Prefix, peerips)
+	n := raft.Start(*id, peers.Ids())
+	s := &etcdserver.Server{
+		Node: n,
+		Save: func(st raftpb.State, ents []raftpb.Entry) {}, // TODO: use wal
+		Send: etcdhttp.Sender(V2Prefix),
 	}
-	go e.Run()
-
-	corsInfo, err := newCORSInfo(cfg.CorsOrigins)
-	if err != nil {
-		log.Fatal("cors:", err)
+	etcdserver.Start(s)
+	h := &etcdhttp.Handler{
+		Timeout: timeout,
+		Server:  s,
+		Peers:   peers,
 	}
-
-	readTimeout := time.Duration(cfg.HTTPReadTimeout) * time.Second
-	writeTimeout := time.Duration(cfg.HTTPWriteTimeout) * time.Second
-	go func() {
-		serve("raft", cfg.Peer.BindAddr, cfg.PeerTLSInfo(), corsInfo, e.RaftHandler(), readTimeout, writeTimeout)
-	}()
-	serve("etcd", cfg.BindAddr, cfg.EtcdTLSInfo(), corsInfo, e, readTimeout, writeTimeout)
-}
-
-func serve(who string, addr string, tinfo *conf.TLSInfo, cinfo *CORSInfo, handler http.Handler, readTimeout, writeTimeout time.Duration) {
-	t, terr := tinfo.ServerConfig()
-	l, err := net.Listen("tcp", addr)
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Printf("%v server starts listening on %v\n", who, addr)
-
-	switch tinfo.Scheme() {
-	case "http":
-		log.Printf("%v server starts serving HTTP\n", who)
-
-	case "https":
-		if t == nil {
-			log.Fatalf("failed to create %v tls: %v\n", who, terr)
-		}
-		l = tls.NewListener(l, t)
-		log.Printf("%v server starts serving HTTPS\n", who)
-	default:
-		log.Fatal("unsupported http scheme", tinfo.Scheme())
-	}
-
-	h := &CORSHandler{handler, cinfo}
-	s := &http.Server{Handler: h, ReadTimeout: readTimeout, WriteTimeout: writeTimeout}
-	log.Fatal(s.Serve(l))
+	http.Handle(V2Prefix, http.StripPrefix(V2Prefix, h))
+	log.Fatal(http.ListenAndServe(*laddr, nil))
 }