Skip to content

Fix handling of --quiet flag in fleetctl query #2

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

Merged
zwass merged 1 commit into from
Nov 3, 2020
Merged

Fix handling of --quiet flag in fleetctl query #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions cmd/fleetctl/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"strings"
"time"
"io/ioutil"

"github.com/briandowns/spinner"
"github.com/urfave/cli"
Expand Down Expand Up @@ -124,9 +125,10 @@ func queryCommand() cli.Command {
// https://godoc.org/github.com/briandowns/spinner#pkg-variables
s := spinner.New(spinner.CharSets[24], 200*time.Millisecond)
s.Writer = os.Stderr
if !flQuiet {
s.Start()
if flQuiet {
s.Writer = ioutil.Discard
}
s.Start()

var timeoutChan <-chan time.Time
if flTimeout > 0 {
Expand Down Expand Up @@ -176,9 +178,7 @@ func queryCommand() cli.Command {
}

msg := fmt.Sprintf(" %.f%% responded (%.f%% online) | %d/%d targeted hosts (%d/%d online)", percentTotal, percentOnline, responded, total, responded, online)
if !flQuiet {
s.Suffix = msg
}
s.Suffix = msg
if total == responded && status != nil {
s.Stop()
if !flQuiet {
Expand Down