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

etcdmain: add '/health' endpoint to grpc-proxy

Browse Source 
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-07-28 15:24:17 -07:00
parent cd37ef2c1b
commit b8fd5c3dba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdmain/grpc_proxy.go
View File

@ -154,7 +154,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) {
client := mustNewClient() client := mustNewClient()
srvhttp, httpl := mustHTTPListener(m, tlsinfo) srvhttp, httpl := mustHTTPListener(m, tlsinfo, client)
errc := make(chan error) errc := make(chan error)
go func() { errc <- newGRPCProxyServer(client).Serve(grpcl) }() go func() { errc <- newGRPCProxyServer(client).Serve(grpcl) }()
go func() { errc <- srvhttp.Serve(httpl) }() go func() { errc <- srvhttp.Serve(httpl) }()
@ -164,6 +164,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) {
go func() { go func() {
mux := http.NewServeMux() mux := http.NewServeMux()
etcdhttp.HandlePrometheus(mux) etcdhttp.HandlePrometheus(mux)
grpcproxy.HandleHealth(mux, client)
plog.Fatal(http.Serve(mhttpl, mux)) plog.Fatal(http.Serve(mhttpl, mux))
}() }()
} }
@ -310,10 +311,11 @@ func newGRPCProxyServer(client *clientv3.Client) *grpc.Server {
return server return server
} }
func mustHTTPListener(m cmux.CMux, tlsinfo *transport.TLSInfo) (*http.Server, net.Listener) { func mustHTTPListener(m cmux.CMux, tlsinfo *transport.TLSInfo, c *clientv3.Client) (*http.Server, net.Listener) {
httpmux := http.NewServeMux() httpmux := http.NewServeMux()
httpmux.HandleFunc("/", http.NotFound) httpmux.HandleFunc("/", http.NotFound)
etcdhttp.HandlePrometheus(httpmux) etcdhttp.HandlePrometheus(httpmux)
grpcproxy.HandleHealth(httpmux, c)
if grpcProxyEnablePprof { if grpcProxyEnablePprof {
for p, h := range debugutil.PProfHandlers() { for p, h := range debugutil.PProfHandlers() {
httpmux.Handle(p, h) httpmux.Handle(p, h)