Browse Source

etcdmain: update v2 proxy ready message

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
f556b78e8c
2 changed files with 11 additions and 4 deletions
  1. 2 2
      etcdmain/etcd.go
  2. 9 2
      etcdmain/grpc_proxy.go

+ 2 - 2
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

+ 9 - 2
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)