Exit after running --test without requiring --console (influxdata#5631)

bearstech · Apr 17, 2020 · b26b997 · b26b997
1 parent 380a2af
commit b26b997
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
@@ -342,7 +342,7 @@ func main() {
 		log.Println("Telegraf version already configured to: " + internal.Version())
 	}
 
-	if runtime.GOOS == "windows" && !(*fRunAsConsole) {
+	if runtime.GOOS == "windows" && windowsRunAsService() {
 		svcConfig := &service.Config{
 			Name:        *fServiceName,
 			DisplayName: "Telegraf Data Collector Service",
@@ -392,3 +392,16 @@ func main() {
 		)
 	}
 }
+
+// Return true if Telegraf should create a Windows service.
+func windowsRunAsService() bool {
+	if *fService != "" {
+		return true
+	}
+
+	if *fRunAsConsole {
+		return false
+	}
+
+	return !service.Interactive()
+}