Browse Source

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

Backport #15749

* Drop back to use IsAnInteractiveSession for SVC

There is an apparent permission change problem when using
IsWindowsService to determine if the SVC manager should be
used.

This PR simply drops back to using IsAnInteractiveSession as
this does not change behaviour.

Fix #15454

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Yes staticcheck I know this is deprecated

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Just leave me alone lint

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
mj-v1.14.3
zeripath 2 years ago
committed by GitHub
parent
commit
1ec11ac87e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .golangci.yml
  2. 6
      modules/graceful/manager_windows.go

4
.golangci.yml

@ -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
modules/graceful/manager_windows.go

@ -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
}

Loading…
Cancel
Save