Merge pull request #21479 from vespa-engine/mpolden/quiet-config

Support setting quiet option through config
vespa-engine · Mar 1, 2022 · c8efa8e · c8efa8e
2 parents e87944d + c7b8d8c
commit c8efa8e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/client/go/cmd/config.go b/client/go/cmd/config.go
@@ -304,6 +304,12 @@ func (c *Config) Set(option, value string) error {
 			viper.Set(option, value)
 			return nil
 		}
+	case quietFlag:
+		switch value {
+		case "true", "false":
+			viper.Set(option, value)
+			return nil
+		}
 	case apiKeyFileFlag:
 		viper.Set(option, value)
 		return nil

diff --git a/client/go/cmd/config_test.go b/client/go/cmd/config_test.go
@@ -38,6 +38,9 @@ func TestConfig(t *testing.T) {
 	assertConfigCommand(t, "", homeDir, "config", "set", "wait", "60")
 	assertConfigCommandErr(t, "Error: wait option must be an integer >= 0, got \"foo\"\n", homeDir, "config", "set", "wait", "foo")
 	assertConfigCommand(t, "wait = 60\n", homeDir, "config", "get", "wait")
+
+	assertConfigCommand(t, "", homeDir, "config", "set", "quiet", "true")
+	assertConfigCommand(t, "", homeDir, "config", "set", "quiet", "false")
 }
 
 func assertConfigCommand(t *testing.T, expected, homeDir string, args ...string) {

diff --git a/client/go/cmd/root.go b/client/go/cmd/root.go
@@ -82,16 +82,15 @@ func isTerminal() bool {
 }
 
 func configureOutput() error {
-	if quietArg {
-		stdout = ioutil.Discard
-	}
-	log.SetFlags(0) // No timestamps
-	log.SetOutput(stdout)
-
 	config, err := LoadConfig()
 	if err != nil {
 		return err
 	}
+	if quiet, _ := config.Get(quietFlag); quiet == "true" {
+		stdout = ioutil.Discard
+	}
+	log.SetFlags(0) // No timestamps
+	log.SetOutput(stdout)
 	colorValue, _ := config.Get(colorFlag)
 	colorize := false
 	switch colorValue {