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

[8.7](backport #35474) winlogbeat: allow termination while attempting to open channels #35491

Merged
merged 2 commits into from
May 16, 2023
Merged

[8.7](backport #35474) winlogbeat: allow termination while attempting to open channels #35491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
799744d
winlogbeat: allow termination while attempting to open channels (#35474)
efd6 May 16, 2023
42fc028
Update CHANGELOG.next.asciidoc
efd6 May 16, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ https://github.com/elastic/beats/compare/v8.7.1\...main[Check the HEAD diff]

- Fix crash when processing forwarded logs missing a message. {issue}34705[34705] {pull}34865[34865]
- Move repeated channel not found errors to debug level. {issue}35314[35314] {pull}35317[35317]
- Allow program termination when attempting to open an absent channel. {pull}35474[35474]

*Functionbeat*

Expand Down
6 changes: 6 additions & 0 deletions winlogbeat/beater/eventlogger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ func (e *eventLogger) run(

runLoop:
for stop := false; !stop; {
select {
case <-done:
return
default:
}

err = api.Open(state)

switch {
Expand Down