From f556b78e8cdbad607f784f994bfa3f0bb4e633c0 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 4 May 2018 18:34:35 -0700 Subject: [PATCH] etcdmain: update v2 proxy ready message Signed-off-by: Gyuho Lee --- etcdmain/etcd.go | 4 ++-- etcdmain/grpc_proxy.go | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index c0a24ff90..97dbba5f3 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -549,9 +549,9 @@ func startProxy(cfg *config) error { host := u.String() go func() { if lg != nil { - lg.Info("proxy started listening on client requests", zap.String("host", host)) + lg.Info("v2 proxy started listening on client requests", zap.String("host", host)) } else { - plog.Info("proxy: listening for client requests on ", host) + plog.Infof("v2 proxy started listening on client requests on %q", host) } mux := http.NewServeMux() etcdhttp.HandlePrometheus(mux) // v2 proxy just uses the same port diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index aad8a088e..591def3ac 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -195,7 +195,7 @@ func startGRPCProxy(cmd *cobra.Command, args []string) { grpcl := m.Match(cmux.HTTP2()) defer func() { grpcl.Close() - lg.Info("stopping listening gRPC proxy client requests", zap.String("address", grpcProxyListenAddr)) + lg.Info("stop listening gRPC proxy client requests", zap.String("address", grpcProxyListenAddr)) }() client := mustNewClient(lg) @@ -211,11 +211,18 @@ func startGRPCProxy(cmd *cobra.Command, args []string) { mux := http.NewServeMux() etcdhttp.HandlePrometheus(mux) grpcproxy.HandleHealth(mux, client) + lg.Info("gRPC proxy server metrics URL serving") herr := http.Serve(mhttpl, mux) - lg.Fatal("gRPC proxy server serve returned", zap.Error(herr)) + if herr != nil { + lg.Fatal("gRPC proxy server metrics URL returned", zap.Error(herr)) + } else { + lg.Info("gRPC proxy server metrics URL returned") + } }() } + lg.Info("started gRPC proxy", zap.String("address", grpcProxyListenAddr)) + // grpc-proxy is initialized, ready to serve notifySystemd(lg)