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

Do not hard fail on non-decodable events 

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2019-04-26 10:50:57 -04:00
parent 04d6ff0582
commit e05af78329
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/events/events.go
View File

@ -92,7 +92,7 @@ func StringToType(name string) (Type, error) {
case Volume.String(): case Volume.String():
return Volume, nil return Volume, nil
} }
return "", errors.Errorf("unknown event type %s", name) return "", errors.Errorf("unknown event type %q", name)
} }
// StringToStatus converts a string to an Event Status // StringToStatus converts a string to an Event Status
@ -111,7 +111,6 @@ func StringToStatus(name string) (Status, error) {
case Commit.String(): case Commit.String():
return Commit, nil return Commit, nil
case Create.String(): case Create.String():
return Create, nil return Create, nil
case Exec.String(): case Exec.String():
return Exec, nil return Exec, nil
@ -164,7 +163,7 @@ func StringToStatus(name string) (Status, error) {
case Untag.String(): case Untag.String():
return Untag, nil return Untag, nil
} }
return "", errors.Errorf("unknown event status %s", name) return "", errors.Errorf("unknown event status %q", name)
} }
func (e EventLogFile) getTail(options ReadOptions) (*tail.Tail, error) { func (e EventLogFile) getTail(options ReadOptions) (*tail.Tail, error) {

7
libpod/events/journal_linux.go
View File

@ -7,6 +7,7 @@ import (
"github.com/coreos/go-systemd/journal" "github.com/coreos/go-systemd/journal"
"github.com/coreos/go-systemd/sdjournal" "github.com/coreos/go-systemd/sdjournal"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
// EventJournalD is the journald implementation of an eventer // EventJournalD is the journald implementation of an eventer
@ -87,7 +88,11 @@ func (e EventJournalD) Read(options ReadOptions) error {
} }
newEvent, err := newEventFromJournalEntry(entry) newEvent, err := newEventFromJournalEntry(entry)
if err != nil { 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 include := true
for _, filter := range eventOptions { for _, filter := range eventOptions {