From 9bedf84740cb944d33560f1184c59b4889808af5 Mon Sep 17 00:00:00 2001 From: Svarog Date: Wed, 16 Jun 2021 15:05:19 +0300 Subject: [PATCH] kaspawallet: Add timeout to connect to daemon, and print friendly error (#1756) message if it's not available --- cmd/kaspawallet/daemon/client/client.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cmd/kaspawallet/daemon/client/client.go b/cmd/kaspawallet/daemon/client/client.go index 93718f0a7..487965b69 100644 --- a/cmd/kaspawallet/daemon/client/client.go +++ b/cmd/kaspawallet/daemon/client/client.go @@ -1,14 +1,26 @@ package client import ( + "context" + "time" + + "github.com/pkg/errors" + "github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/pb" "google.golang.org/grpc" ) // Connect connects to the kaspawalletd server, and returns the client instance func Connect(address string) (pb.KaspawalletdClient, func(), error) { - conn, err := grpc.Dial(address, grpc.WithInsecure(), grpc.WithBlock()) + // Connection is local, so 1 second timeout is sufficient + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + + conn, err := grpc.DialContext(ctx, address, grpc.WithInsecure(), grpc.WithBlock()) if err != nil { + if errors.Is(err, context.DeadlineExceeded) { + return nil, nil, errors.New("kaspactl daemon is not running, start it with `kaspactl start-daemon`") + } return nil, nil, err }