diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-26 11:16:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 11:16:27 -0700 |
| commit | e8ede74f5ef7b0d044c5d5344186fb998f676cec (patch) | |
| tree | 9ee3a51fc6c94b9913da7b6097b4a4960372c766 /libpod/events/journal_linux.go | |
| parent | a85155617fb1ed4248adb2169845f4a08ab88789 (diff) | |
| parent | e05af783295c9f4a0b210c0e6d368cf8c6dfe7c6 (diff) | |
| download | podman-e8ede74f5ef7b0d044c5d5344186fb998f676cec.tar.gz podman-e8ede74f5ef7b0d044c5d5344186fb998f676cec.tar.bz2 podman-e8ede74f5ef7b0d044c5d5344186fb998f676cec.zip | |
Merge pull request #3019 from mheon/system_events
Add System event type and renumber, refresh events
Diffstat (limited to 'libpod/events/journal_linux.go')
| -rw-r--r-- | libpod/events/journal_linux.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index e6b54db1d..8ba5bc2c7 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -7,6 +7,7 @@ import ( "github.com/coreos/go-systemd/journal" "github.com/coreos/go-systemd/sdjournal" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) // EventJournalD is the journald implementation of an eventer @@ -87,7 +88,11 @@ func (e EventJournalD) Read(options ReadOptions) error { } newEvent, err := newEventFromJournalEntry(entry) if err != nil { - return err + // We can't decode this event. + // Don't fail hard - that would make events unusable. + // Instead, log and continue. + logrus.Errorf("Unable to decode event: %v", err) + continue } include := true for _, filter := range eventOptions { |