Skip to content
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

Exit after running --test without requiring --console #5631

Merged
merged 1 commit into from
Mar 27, 2019
Merged

Exit after running --test without requiring --console #5631

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
15 changes: 14 additions & 1 deletion cmd/telegraf/telegraf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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()
}