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

Allow runner.Shutdown to be called more than once #1354

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Allow runner.Shutdown to be called more than once #1354

merged 1 commit into from
Sep 14, 2023

Conversation

RebeccaMahany
Copy link
Contributor

Relates to: #1205

@zackattack01 noticed that the osquery runner actor cannot handle being interrupted more than once:

panic: close of closed channel

goroutine 1873 [running]:
github.com/kolide/launcher/pkg/osquery/runtime.(*Runner).Shutdown(0x1400070b020)
        /Users/runner/work/launcher/launcher/pkg/osquery/runtime/runner.go:143 +0x38
...

This PR corrects that issue in a similar way to how I corrected it in #1344

@RebeccaMahany RebeccaMahany mentioned this pull request Sep 14, 2023
Open
zackattack01
zackattack01 approved these changes Sep 14, 2023
View reviewed changes
Copy link
Contributor

@zackattack01 zackattack01 left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@RebeccaMahany RebeccaMahany added this pull request to the merge queue Sep 14, 2023
Merged via the queue into kolide:main with commit c477cdd Sep 14, 2023
25 checks passed
@RebeccaMahany RebeccaMahany deleted the becca/runner-shutdown-panic branch September 14, 2023 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zackattack01 zackattack01 zackattack01 approved these changes

@James-Pickett James-Pickett James-Pickett approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RebeccaMahany @James-Pickett @zackattack01