diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-08-12 16:30:05 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-08-12 19:05:44 -0400 |
| commit | d3a433181d4aefb6b8d2efdd18066c7322f658a2 (patch) | |
| tree | b2eeddb944449601ee879f00951eb58f803e9bdd | |
| parent | f634fd39001ad3dc62b83e5d78c6912db915a1e9 (diff) | |
| download | podman-d3a433181d4aefb6b8d2efdd18066c7322f658a2.tar.gz podman-d3a433181d4aefb6b8d2efdd18066c7322f658a2.tar.bz2 podman-d3a433181d4aefb6b8d2efdd18066c7322f658a2.zip | |
Fix container exit code with Journald backend
We weren't actually storing this, so we'd lose the exit code for
containers run with --rm or force-removed while running if the
journald backend for events was in use.
Fixes #3795
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | libpod/events/journal_linux.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go index 7d195dc79..72551c9ec 100644 --- a/libpod/events/journal_linux.go +++ b/libpod/events/journal_linux.go @@ -4,6 +4,7 @@ package events import ( "fmt" + "strconv" "time" "github.com/coreos/go-systemd/journal" @@ -42,6 +43,7 @@ func (e EventJournalD) Write(ee Event) error { m["PODMAN_IMAGE"] = ee.Image m["PODMAN_NAME"] = ee.Name m["PODMAN_ID"] = ee.ID + m["PODMAN_EXIT_CODE"] = strconv.Itoa(ee.ContainerExitCode) case Volume: m["PODMAN_NAME"] = ee.Name } @@ -150,6 +152,14 @@ func newEventFromJournalEntry(entry *sdjournal.JournalEntry) (*Event, error) { / case Container, Pod: newEvent.ID = entry.Fields["PODMAN_ID"] newEvent.Image = entry.Fields["PODMAN_IMAGE"] + if code, ok := entry.Fields["PODMAN_EXIT_CODE"]; ok { + intCode, err := strconv.Atoi(code) + if err != nil { + logrus.Errorf("Error parsing event exit code %s", code) + } else { + newEvent.ContainerExitCode = intCode + } + } case Image: newEvent.ID = entry.Fields["PODMAN_ID"] } |