Use 'switch' instead of 'if' to check the logFormat. Return error if the value is not valid

Mohammed Ammer · Mohammed Ammer · commit 2e1fc41d7a3e · 2024-11-05T17:57:31.000+01:00
diff --git a/cmd/slo_exporter.go b/cmd/slo_exporter.go
@@ -100,9 +100,10 @@ func setupLogger(logLevel string, logFormat string) (*logrus.Logger, error) {
 		return nil, err
 	}
 
-	if logFormat != "json" && logFormat != "text" {
-		logFormat = "text"
-		logrus.Warningf("invalid log format '%s', using 'text' instead", logFormat)
+	switch logFormat {
+	case "json", "text":
+	default:
+		return nil, fmt.Errorf("invalid log format '%s', must be 'json' or 'text'", logFormat)
 	}
 
 	newLogger := logrus.New()

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,10 @@ func setupLogger(logLevel string, logFormat string) (*logrus.Logger, error) {`
`100`	`100`	`return nil, err`
`101`	`101`	`}`
`102`	`102`
`103`		`- if logFormat != "json" && logFormat != "text" {`
`104`		`- logFormat = "text"`
`105`		`- logrus.Warningf("invalid log format '%s', using 'text' instead", logFormat)`
	`103`	`+ switch logFormat {`
	`104`	`+ case "json", "text":`
	`105`	`+ default:`
	`106`	`+ return nil, fmt.Errorf("invalid log format '%s', must be 'json' or 'text'", logFormat)`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`newLogger := logrus.New()`