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

Jump to bottom

Environment variable NO_WINDOWS_SERVICE to force interactive mode on Windows #2272

Merged
merged 3 commits into from
Dec 16, 2020
Merged

Environment variable NO_WINDOWS_SERVICE to force interactive mode on Windows #2272

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
722c2e7
Env var NO_WINDOWS_SERVICE to force interactive mode on Windows
agoallikmaa Dec 8, 2020
94a146a
Some renaming for better clarity.
agoallikmaa Dec 8, 2020
ac53341
Comments/docs for NO_WINDOWS_SERVICE env var
agoallikmaa Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 16 additions & 6 deletions cmd/otelcol/main_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,35 @@ package main

import (
"fmt"
"os"

"golang.org/x/sys/windows/svc"

"go.opentelemetry.io/collector/service"
)

func run(params service.Parameters) error {
isInteractive, err := svc.IsAnInteractiveSession()
if err != nil {
return fmt.Errorf("failed to determine if we are running in an interactive session %w", err)
}

if isInteractive {
if useInteractiveMode, err := checkUseInteractiveMode(); err != nil {
return err
} else if useInteractiveMode {
return runInteractive(params)
} else {
return runService(params)
}
}

func checkUseInteractiveMode() (bool, error) {
if value, present := os.LookupEnv("NO_WINDOWS_SERVICE"); present && value != "0" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment to explain what this does.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

return true, nil
}

if isInteractiveSession, err := svc.IsAnInteractiveSession(); err != nil {
return false, fmt.Errorf("failed to determine if we are running in an interactive session %w", err)
} else {
return isInteractiveSession, nil
}
}

func runService(params service.Parameters) error {
// do not need to supply service name when startup is invoked through Service Control Manager directly
if err := svc.Run("", service.NewWindowsService(params)); err != nil {
Expand Down