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.

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

Ensure desktop runner shuts down within rungroup interrupt timeout, and log shutdown completion #1668

Merged

Conversation

RebeccaMahany
Copy link
Contributor

  • Increase rungroup interrupt timeout to give a little more time for desktop shutdown
  • Ensure that desktop process requests respect shutdown timeout
  • Log successful desktop runner interrupt

@RebeccaMahany RebeccaMahany marked this pull request as ready for review April 2, 2024 16:12
Copy link
Contributor

@James-Pickett James-Pickett left a comment

Choose a reason for hiding this comment

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

Nice

@RebeccaMahany RebeccaMahany added this pull request to the merge queue Apr 2, 2024
Merged via the queue into kolide:main with commit 424978f Apr 2, 2024
29 checks passed
@RebeccaMahany RebeccaMahany deleted the becca/desktop-runner-shutdown-logs branch April 2, 2024 16:45
@@ -516,7 +533,7 @@ func (r *DesktopUsersProcessesRunner) writeDefaultMenuTemplateFile() {
func (r *DesktopUsersProcessesRunner) runConsoleUserDesktop() error {
if !r.processSpawningEnabled {
// Desktop is disabled, kill any existing desktop user processes
r.killDesktopProcesses()
r.killDesktopProcesses(context.Background())
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this intentionally starting a new contenxt? (or should it be context.TODO())

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants