containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3745 from baude/eventsjournaldremovematch 

systemd library conflict with seektail and addmatch
This commit is contained in:
OpenShift Merge Robot 2019-08-08 02:25:08 +02:00 committed by GitHub
parent 35ecf498dc 62a04f2b03
commit 41de7b14e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libpod/events/journal_linux.go
View File

@ -54,14 +54,17 @@ func (e EventJournalD) Read(options ReadOptions) error {
if err != nil { if err != nil {
return errors.Wrapf(err, "failed to generate event options") return errors.Wrapf(err, "failed to generate event options")
} }
podmanJournal := sdjournal.Match{Field: "SYSLOG_IDENTIFIER", Value: "podman"} //nolint j, err := sdjournal.NewJournal() //nolint
j, err := sdjournal.NewJournal() //nolint
if err != nil { if err != nil {
return err return err
} }
if err := j.AddMatch(podmanJournal.String()); err != nil { // TODO AddMatch and Seek seem to conflict
return errors.Wrap(err, "failed to add filter for event log") // Issue filed upstream -> https://github.com/coreos/go-systemd/issues/315
} // Leaving commented code in case upstream fixes things
//podmanJournal := sdjournal.Match{Field: "SYSLOG_IDENTIFIER", Value: "podman"} //nolint
//if err := j.AddMatch(podmanJournal.String()); err != nil {
// return errors.Wrap(err, "failed to add filter for event log")
//}
if len(options.Since) == 0 && len(options.Until) == 0 && options.Stream { if len(options.Since) == 0 && len(options.Until) == 0 && options.Stream {
if err := j.SeekTail(); err != nil { if err := j.SeekTail(); err != nil {
return errors.Wrap(err, "failed to seek end of journal") return errors.Wrap(err, "failed to seek end of journal")
@ -96,6 +99,12 @@ func (e EventJournalD) Read(options ReadOptions) error {
if err != nil { if err != nil {
return err return err
} }
// TODO this keeps us from feeding the podman event parser with
// with regular journal content; it can be removed if the above
// problem with AddMatch is resolved.
if entry.Fields["PODMAN_EVENT"] == "" {
continue
}
newEvent, err := newEventFromJournalEntry(entry) newEvent, err := newEventFromJournalEntry(entry)
if err != nil { if err != nil {
// We can't decode this event. // We can't decode this event.