Fix regression from #14623 - use debug SVC handler only on interactive sessions #15210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…teractive sessions Unfortunately go-gitea#14623 changed from the deprecated IsInteractiveSession to IsWindowsService without recognising that they are the complement of each other. This means that Windows SVC control is not working correctly. This PR adds some Tracing statements but also fixes the bug. Fix go-gitea#15159 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
added
type/bug
issue/regression
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Mar 30, 2021
…teractive sessions (go-gitea#15210) Backport go-gitea#15210 Unfortunately go-gitea#14623 changed from the deprecated IsInteractiveSession to IsWindowsService without recognising that they are the complement of each other. This means that Windows SVC control is not working correctly. This PR adds some Tracing statements but also fixes the bug. Fix go-gitea#15159 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
commented
Mar 30, 2021
Comment on lines
+77
to
+83
| isWindowsService, err := svc.IsWindowsService() | ||
| if err != nil { | ||
| log.Error("Unable to ascertain if running as an Interactive Session: %v", err) | ||
| log.Error("Unable to ascertain if running as an Windows Service: %v", err) | ||
| return | ||
| } | ||
| if isInteractive { | ||
| if !isWindowsService { | ||
| log.Trace("Not running a service ... using the debug SVC manager") |
There was a problem hiding this comment.
This is the actual bugfix
The rest of this PR is adding tracing and logging because we don't have any in this code and it really is necessary
GiteaBot
added
the
lgtm/need 2
techknowlogick
approved these changes
Mar 31, 2021
GiteaBot
added
lgtm/need 1
lafriks
approved these changes
Mar 31, 2021
GiteaBot
added
lgtm/done
zeripath
added a commit
that referenced
this pull request
Mar 31, 2021
…e sessions (#15210) (#15211) Backport #15210 Unfortunately #14623 changed from the deprecated IsInteractiveSession to IsWindowsService without recognising that they are the complement of each other. This means that Windows SVC control is not working correctly. This PR adds some Tracing statements but also fixes the bug. Fix #15159 Signed-off-by: Andrew Thornton <art27@cantab.net>
6 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Unfortunately #14623 changed from the deprecated IsInteractiveSession to
IsWindowsService without recognising that they are the complement of
each other.
This means that Windows SVC control is not working correctly. This PR
adds some Tracing statements but also fixes the bug.
Fix #15159
Signed-off-by: Andrew Thornton art27@cantab.net