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

Merge pull request #4829 from gyuho/server_closure

Browse Source 
etcdmain: fix blocking m.Server closure
This commit is contained in:
Gyu-Ho Lee 2016-03-21 16:50:13 -07:00
commit 0ac4eba60e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdmain/serve.go
View File

@ -36,7 +36,7 @@ func serve(l net.Listener, grpcS *grpc.Server, handler http.Handler, readTimeout
m := cmux.New(l) m := cmux.New(l)
grpcl := m.Match(cmux.HTTP2HeaderField("content-type", "application/grpc")) grpcl := m.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))
httpl = m.Match(cmux.Any()) httpl = m.Match(cmux.Any())
go plog.Fatal(m.Serve()) go func() { plog.Fatal(m.Serve()) }()
go plog.Fatal(grpcS.Serve(grpcl)) go plog.Fatal(grpcS.Serve(grpcl))
} }