Merge "[FAB-3110] Add dialTimeout to gossip comm in prod"

hyperledger · Apr 12, 2017 · b01d3a7 · b01d3a7
2 parents 0bd84d3 + 89d5671
commit b01d3a7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
@@ -124,6 +124,7 @@ func NewCommInstanceWithServer(port int, idMapper identity.Mapper, peerIdentity
 
 // NewCommInstance creates a new comm instance that binds itself to the given gRPC server
 func NewCommInstance(s *grpc.Server, cert *tls.Certificate, idStore identity.Mapper, peerIdentity api.PeerIdentityType, dialOpts ...grpc.DialOption) (Comm, error) {
+	dialOpts = append(dialOpts, grpc.WithTimeout(util.GetDurationOrDefault("peer.gossip.dialTimeout", defDialTimeout)))
 	commInst, err := NewCommInstanceWithServer(-1, idStore, peerIdentity, dialOpts...)
 	if err != nil {
 		return nil, err