Skip to content

Drop back to use IsAnInteractiveSession for SVC (#15749) #15762

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

Merged
merged 3 commits into from
May 7, 2021
Merged

Drop back to use IsAnInteractiveSession for SVC (#15749) #15762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de696dd
Drop back to use IsAnInteractiveSession for SVC (#15749)
zeripath May 7, 2021
812e582
Merge branch 'release/v1.14' into backport-15749-v1.14
zeripath May 7, 2021
d6910ca
Merge branch 'release/v1.14' into backport-15749-v1.14
6543 May 7, 2021
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
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,7 @@ issues:
- text: "exitAfterDefer:"
linters:
- gocritic
- path: modules/graceful/manager_windows.go
linters:
- staticcheck
text: "svc.IsAnInteractiveSession is deprecated: Use IsWindowsService instead."
6 changes: 4 additions & 2 deletions modules/graceful/manager_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,14 @@ func (g *Manager) start() {

// Make SVC process
run := svc.Run
isWindowsService, err := svc.IsWindowsService()

//lint:ignore SA1019 We use IsAnInteractiveSession because IsWindowsService has a different permissions profile
isAnInteractiveSession, err := svc.IsAnInteractiveSession()
if err != nil {
log.Error("Unable to ascertain if running as an Windows Service: %v", err)
return
}
if !isWindowsService {
if isAnInteractiveSession {
log.Trace("Not running a service ... using the debug SVC manager")
run = debug.Run
}
Expand Down