From 55761ae806bc7cc8ab34424508aee5481131b941 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 16 Feb 2019 12:49:58 -0800
Subject: [PATCH] skip nil options

---
 weed/util/grpc_client_server.go | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/weed/util/grpc_client_server.go b/weed/util/grpc_client_server.go
index d029d21ae..7fa650855 100644
--- a/weed/util/grpc_client_server.go
+++ b/weed/util/grpc_client_server.go
@@ -17,24 +17,37 @@ var (
 	grpcClientsLock sync.Mutex
 )
 
-func NewGrpcServer() *grpc.Server {
-	return grpc.NewServer(grpc.KeepaliveParams(keepalive.ServerParameters{
+func NewGrpcServer(opts ...grpc.ServerOption) *grpc.Server {
+	var options []grpc.ServerOption
+	options = append(options, grpc.KeepaliveParams(keepalive.ServerParameters{
 		Time:    10 * time.Second, // wait time before ping if no activity
 		Timeout: 20 * time.Second, // ping timeout
 	}), grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
 		MinTime: 60 * time.Second, // min time a client should wait before sending a ping
 	}))
+	for _, opt := range opts {
+		if opt != nil {
+			options = append(options, opt)
+		}
+	}
+	return grpc.NewServer(options...)
 }
 
 func GrpcDial(address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
 	// opts = append(opts, grpc.WithBlock())
 	// opts = append(opts, grpc.WithTimeout(time.Duration(5*time.Second)))
-	opts = append(opts, grpc.WithInsecure())
-	opts = append(opts, grpc.WithKeepaliveParams(keepalive.ClientParameters{
-		Time:    30 * time.Second, // client ping server if no activity for this long
-		Timeout: 20 * time.Second,
-	}))
-
+	var options []grpc.DialOption
+	options = append(options,
+		grpc.WithInsecure(),
+		grpc.WithKeepaliveParams(keepalive.ClientParameters{
+			Time:    30 * time.Second, // client ping server if no activity for this long
+			Timeout: 20 * time.Second,
+		}))
+	for _, opt := range opts {
+		if opt != nil {
+			options = append(options, opt)
+		}
+	}
 	return grpc.Dial(address, opts...)
 }