From 4581e6c5094f4d5ffd76c0610e6b26dff99e70a5 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Tue, 18 Aug 2020 20:16:13 +0300 Subject: [PATCH 1/2] Return non-zero status code if added transport is not up --- cmd/skywire-cli/commands/visor/transports.go | 4 ++++ pkg/visor/rpc_client.go | 1 + 2 files changed, 5 insertions(+) diff --git a/cmd/skywire-cli/commands/visor/transports.go b/cmd/skywire-cli/commands/visor/transports.go index ebe5971a16..f9b992e997 100644 --- a/cmd/skywire-cli/commands/visor/transports.go +++ b/cmd/skywire-cli/commands/visor/transports.go @@ -108,6 +108,10 @@ var addTpCmd = &cobra.Command{ logger.WithError(err).Fatalf("Failed to establish %v transport", transportType) } + if !tp.IsUp { + logger.Fatalf("Established %v transport to %v with ID %v, but it isn't up", transportType, pk, tp.ID) + } + logger.Infof("Established %v transport to %v", transportType, pk) } else { transportTypes := []string{ diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go index 080e178ef4..4abc091924 100644 --- a/pkg/visor/rpc_client.go +++ b/pkg/visor/rpc_client.go @@ -239,6 +239,7 @@ func (rc *rpcClient) AddTransport(remote cipher.PubKey, tpType string, public bo Public: public, Timeout: timeout, }, &summary) + return &summary, err } From b6eaa3cb7c117b0eb8c0b966220191d675dc51ab Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Tue, 18 Aug 2020 21:42:15 +0300 Subject: [PATCH 2/2] Fix logs --- pkg/snet/network.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/snet/network.go b/pkg/snet/network.go index df3af58e68..ce980b9f20 100644 --- a/pkg/snet/network.go +++ b/pkg/snet/network.go @@ -385,7 +385,7 @@ func (n *Network) Dial(ctx context.Context, network string, pk cipher.PubKey, po conn, err := client.Dial(ctx, pk, port) if err != nil { - return nil, fmt.Errorf("sudph client: %w", err) + return nil, fmt.Errorf("dial: %w", err) } log.Infof("Dialed %v, conn local address %q, remote address %q", network, conn.LocalAddr(), conn.RemoteAddr()) @@ -411,7 +411,7 @@ func (n *Network) Listen(network string, port uint16) (*Listener, error) { lis, err := client.Listen(port) if err != nil { - return nil, fmt.Errorf("sudph client: %w", err) + return nil, fmt.Errorf("listen: %w", err) } return makeListener(lis, network), nil