Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cmd): adding timeout flag #3580

Merged
merged 12 commits into from
Oct 3, 2024
Merged

feat(cmd): adding timeout flag #3580

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a53e2a
fix: 3575
sebasti810 Jul 19, 2024
e18f3ac
fix(rpc): resolve linter issues and improve code formatting
sebasti810 Jul 22, 2024
2f62c98
refactor(api): using context instead of an extra option
sebasti810 Sep 6, 2024
164769e
chore(api): clean up
sebasti810 Sep 6, 2024
8a37e79
chore(api): clean up
sebasti810 Sep 6, 2024
cf9d527
chore(api): adding a comment
sebasti810 Sep 6, 2024
b026944
Merge branch 'main' into fix-3575
Wondertan Oct 2, 2024
cd0d5b9
Merge branch 'main' into fix-3575
renaynay Oct 2, 2024
f7bbb68
lint
renaynay Oct 2, 2024
7f322db
Merge branch 'main' into fix-3575
cristaloleg Oct 2, 2024
4855104
Merge branch 'main' into fix-3575
Wondertan Oct 2, 2024
517e864
chore: lint
renaynay Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions cmd/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"path/filepath"
"time"

"github.com/spf13/cobra"
flag "github.com/spf13/pflag"
Expand All @@ -18,6 +19,7 @@ import (
var (
requestURL string
authTokenFlag string
timeoutFlag time.Duration
)

func RPCFlags() *flag.FlagSet {
Expand All @@ -37,6 +39,13 @@ func RPCFlags() *flag.FlagSet {
"Authorization token",
)

fset.DurationVar(
&timeoutFlag,
"timeout",
0,
"Timeout for RPC requests (e.g. 30s, 1m)",
)

storeFlag := NodeFlags().Lookup(nodeStoreFlag)
fset.AddFlag(storeFlag)
return fset
Expand Down Expand Up @@ -73,6 +82,12 @@ func InitClient(cmd *cobra.Command, _ []string) error {
}
}

if timeoutFlag > 0 {
// we don't cancel, because we want to keep this context alive outside the InitClient Function
ctx, _ := context.WithTimeout(cmd.Context(), timeoutFlag) //nolint:govet
cmd.SetContext(ctx)
}

client, err := rpc.NewClient(cmd.Context(), requestURL, authTokenFlag)
if err != nil {
return err
Expand Down
Loading