Skip to content

Commit

Permalink
Fix waiting for new events (elastic#10593)
Browse files Browse the repository at this point in the history
* Adding more syscalls to the whitelist in `libbeat`
 I have removed the seccomp policy of `journalbeat`. Four new syscalls has been added to the common policy instead: `fstatfs`, `getrlimit`, `ppoll` and `splice`.
* Eliminate possible deadlock when closing the client
* Previously, `journalbeat` was unable to read new entries from the journal after it has been started. Now it is fixed, and the reader code is much simpler now.
* updated vendored `github.com/coreos/go-systemd/sdjournal` to latest release (no changes)
  • Loading branch information
kvch authored Feb 14, 2019
1 parent edc3d33 commit 1dc58e0
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 341 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

==== Known Issue

*Journalbeat*

- Journalbeat requires at least systemd v233 in order to follow entries after journal changes (rotation, vacuum).
4 changes: 2 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/coreos/go-systemd
Version: v17
Revision: 39ca1b05acc7ad1220e09f133283b8859a8b71ab
Version: v18
Revision: 9002847aa1425fb6ac49077c0a630b3b67e0fbfd
License type (autodetected): Apache-2.0
./vendor/github.com/coreos/go-systemd/LICENSE:
--------------------------------------------------------------------
Expand Down
122 changes: 0 additions & 122 deletions journalbeat/include/seccomp_linux_386.go

This file was deleted.

135 changes: 0 additions & 135 deletions journalbeat/include/seccomp_linux_amd64.go

This file was deleted.

2 changes: 1 addition & 1 deletion journalbeat/input/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@ func (i *Input) publishAll() {

// Stop stops all readers of the input.
func (i *Input) Stop() {
i.client.Close()
for _, r := range i.readers {
r.Close()
}
i.client.Close()
}

// Wait waits until all readers are done.
Expand Down
Loading

0 comments on commit 1dc58e0

Please sign in to comment.