Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcd: support cors

Browse Source
This commit is contained in:
Xiang Li 2014-07-09 09:57:05 -07:00 committed by Yicheng Qin
parent 45c6bf80e1
commit c4e7432ef9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main.go
View File

@ -12,6 +12,7 @@ import (
"github.com/coreos/etcd/config" "github.com/coreos/etcd/config"
"github.com/coreos/etcd/etcd" "github.com/coreos/etcd/etcd"
ehttp "github.com/coreos/etcd/http"
) )
func main() { func main() {
@ -29,10 +30,15 @@ func main() {
e := etcd.New(config, genId()) e := etcd.New(config, genId())
go e.Run() go e.Run()
corsInfo, err := ehttp.NewCORSInfo(config.CorsOrigins)
if err != nil {
log.Fatal("cors:", err)
}
go func() { go func() {
serve("raft", config.Peer.BindAddr, config.PeerTLSInfo(), e.RaftHandler()) serve("raft", config.Peer.BindAddr, config.PeerTLSInfo(), corsInfo, e.RaftHandler())
}() }()
serve("etcd", config.BindAddr, config.EtcdTLSInfo(), e) serve("etcd", config.BindAddr, config.EtcdTLSInfo(), corsInfo, e)
} }
func genId() int { func genId() int {
@ -40,15 +46,15 @@ func genId() int {
return r.Int() return r.Int()
} }
func serve(who string, addr string, info *config.TLSInfo, handler http.Handler) { func serve(who string, addr string, tinfo *config.TLSInfo, cinfo *ehttp.CORSInfo, handler http.Handler) {
t, terr := info.ServerConfig() t, terr := tinfo.ServerConfig()
l, err := net.Listen("tcp", addr) l, err := net.Listen("tcp", addr)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
log.Printf("%v server starts listening on %v\n", who, addr) log.Printf("%v server starts listening on %v\n", who, addr)
switch info.Scheme() { switch tinfo.Scheme() {
case "http": case "http":
log.Printf("%v server starts serving HTTP\n", who) log.Printf("%v server starts serving HTTP\n", who)
@ -59,8 +65,9 @@ func serve(who string, addr string, info *config.TLSInfo, handler http.Handler)
l = tls.NewListener(l, t) l = tls.NewListener(l, t)
log.Printf("%v server starts serving HTTPS\n", who) log.Printf("%v server starts serving HTTPS\n", who)
default: default:
log.Fatal("unsupported http scheme", info.Scheme()) log.Fatal("unsupported http scheme", tinfo.Scheme())
} }
log.Fatal(http.Serve(l, handler)) h := &ehttp.CORSHandler{handler, cinfo}
log.Fatal(http.Serve(l, h))
} }