Fix combined status (#440)

thll · web-flow · commit 8e06df9aecb3 · 2022-09-01T17:35:03.000+02:00
Don't fall through to an error status, when the collector status is "stopped".
diff --git a/api/graylog.go b/api/graylog.go
@@ -276,14 +276,12 @@ func NewStatusRequest() graylog.StatusRequest {
 		}
 	}
 
-	switch {
-	default:
-		combinedStatus = backends.StatusRunning
-	case stoppedCount != 0:
-		combinedStatus = backends.StatusStopped
-		fallthrough
-	case errorCount != 0:
+	if errorCount != 0 {
 		combinedStatus = backends.StatusError
+	} else if stoppedCount != 0 {
+		combinedStatus = backends.StatusStopped
+	} else {
+		combinedStatus = backends.StatusRunning
 	}
 
 	statusMessage := strconv.Itoa(runningCount) + " running / " +

Original file line number	Diff line number	Diff line change
`@@ -276,14 +276,12 @@ func NewStatusRequest() graylog.StatusRequest {`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
`279`		`- switch {`
`280`		`- default:`
`281`		`- combinedStatus = backends.StatusRunning`
`282`		`- case stoppedCount != 0:`
`283`		`- combinedStatus = backends.StatusStopped`
`284`		`- fallthrough`
`285`		`- case errorCount != 0:`
	`279`	`+ if errorCount != 0 {`
`286`	`280`	`combinedStatus = backends.StatusError`
	`281`	`+ } else if stoppedCount != 0 {`
	`282`	`+ combinedStatus = backends.StatusStopped`
	`283`	`+ } else {`
	`284`	`+ combinedStatus = backends.StatusRunning`
`287`	`285`	`}`
`288`	`286`
`289`	`287`	`statusMessage := strconv.Itoa(runningCount) + " running / " +`