opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix container exit code with Journald backend

Browse Source 
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>
This commit is contained in:
Matthew Heon
2019-08-12 16:30:05 -04:00
parent f634fd3900
commit d3a433181d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/events/journal_linux.go
View File

@ -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"]
}