george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#665] cli: Set non-zero exit codes in err cases

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-07-06 15:27:54 +03:00 • committed by Leonard Lyubich
parent 8965e70463
commit 3a7d7bdecd
8 changed files with 245 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

46
cmd/neofs-cli/modules/netmap.go
View file

@ -3,7 +3,6 @@ package cmd
import (
"context"
"encoding/hex"
"fmt"
"github.com/mr-tron/base58"
"github.com/nspcc-dev/neo-go/pkg/config/netmode"
@ -43,22 +42,13 @@ var getEpochCmd = &cobra.Command{
Long: "Get current epoch number",
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
cli, err := getSDKClient(key)
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
netInfo, err := cli.NetworkInfo(context.Background(), globalCallOptions()...)
if err != nil {
cmd.PrintErrln(fmt.Errorf("rpc error: %w", err))
return
}
exitOnErr(cmd, errf("rpc error: %w", err))
cmd.Println(netInfo.CurrentEpoch())
},
@ -70,22 +60,13 @@ var localNodeInfoCmd = &cobra.Command{
Long: `Get local node info`,
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
cli, err := getSDKClient(key)
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
nodeInfo, err := cli.EndpointInfo(context.Background(), globalCallOptions()...)
if err != nil {
cmd.PrintErrln(fmt.Errorf("rpc error: %w", err))
return
}
exitOnErr(cmd, errf("rpc error: %w", err))
prettyPrintNodeInfo(cmd, nodeInfo.NodeInfo(), nodeInfoJSON)
},
@ -97,22 +78,13 @@ var netInfoCmd = &cobra.Command{
Long: "Get information about NeoFS network",
Run: func(cmd *cobra.Command, args []string) {
key, err := getKey()
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
cli, err := getSDKClient(key)
if err != nil {
cmd.PrintErrln(err)
return
}
exitOnErr(cmd, err)
netInfo, err := cli.NetworkInfo(context.Background(), globalCallOptions()...)
if err != nil {
cmd.PrintErrln(fmt.Errorf("rpc error: %w", err))
return
}
exitOnErr(cmd, errf("rpc error: %w", err))
cmd.Printf("Epoch: %d\n", netInfo.CurrentEpoch())