github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-02 18:23:12 +00:00
Code Issues Projects Releases Wiki Activity

logging: Reset external loggers when cid+sid available

Browse Source 
Once `containerID` and `sandboxID` fields are available, re-register
the logger with the external packages to ensure they too display these
important fields.

Fixes #467.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2018-07-04 14:49:58 +01:00
parent 03d4d4937c
commit 64e2ca35dd
9 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/create.go
View File

@ -89,6 +89,7 @@ func create(containerID, bundlePath, console, pidFilePath string, detach bool,
var err error var err error
kataLog = kataLog.WithField("container", containerID) kataLog = kataLog.WithField("container", containerID)
setExternalLoggers(kataLog)
// Checks the MUST and MUST NOT from OCI runtime specification // Checks the MUST and MUST NOT from OCI runtime specification
if bundlePath, err = validCreateParams(containerID, bundlePath); err != nil { if bundlePath, err = validCreateParams(containerID, bundlePath); err != nil {
@ -240,6 +241,7 @@ func createSandbox(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
} }
kataLog = kataLog.WithField("sandbox", sandbox.ID()) kataLog = kataLog.WithField("sandbox", sandbox.ID())
setExternalLoggers(kataLog)
containers := sandbox.GetAllContainers() containers := sandbox.GetAllContainers()
if len(containers) != 1 { if len(containers) != 1 {
@ -267,6 +269,7 @@ func createContainer(ociSpec oci.CompatOCISpec, containerID, bundlePath,
} }
kataLog = kataLog.WithField("sandbox", sandboxID) kataLog = kataLog.WithField("sandbox", sandboxID)
setExternalLoggers(kataLog)
_, c, err := vci.CreateContainer(sandboxID, contConfig) _, c, err := vci.CreateContainer(sandboxID, contConfig)
if err != nil { if err != nil {

2
cli/delete.go
View File

@ -64,6 +64,8 @@ func delete(containerID string, force bool) error {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
containerID = status.ID containerID = status.ID
containerType, err := oci.GetContainerType(status.Annotations) containerType, err := oci.GetContainerType(status.Annotations)

2
cli/events.go
View File

@ -156,6 +156,8 @@ information is displayed once every 5 seconds.`,
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
if status.State.State == vc.StateStopped { if status.State.State == vc.StateStopped {
return fmt.Errorf("container with id %s is not running", status.ID) return fmt.Errorf("container with id %s is not running", status.ID)
} }

2
cli/exec.go
View File

@ -194,6 +194,8 @@ func execute(context *cli.Context) error {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
// Retrieve OCI spec configuration. // Retrieve OCI spec configuration.
ociSpec, err := oci.GetOCIConfig(status) ociSpec, err := oci.GetOCIConfig(status)
if err != nil { if err != nil {

2
cli/kill.go
View File

@ -104,6 +104,8 @@ func kill(containerID, signal string, all bool) error {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
signum, err := processSignal(signal) signum, err := processSignal(signal)
if err != nil { if err != nil {
return err return err

2
cli/pause.go
View File

@ -55,6 +55,8 @@ func toggleContainerPause(containerID string, pause bool) (err error) {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
if pause { if pause {
err = vci.PauseContainer(sandboxID, containerID) err = vci.PauseContainer(sandboxID, containerID)
} else { } else {

2
cli/ps.go
View File

@ -61,6 +61,8 @@ func ps(containerID, format string, args []string) error {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
// container MUST be running // container MUST be running
if status.State.State != vc.StateRunning { if status.State.State != vc.StateRunning {
return fmt.Errorf("Container %s is not running", containerID) return fmt.Errorf("Container %s is not running", containerID)

2
cli/start.go
View File

@ -52,6 +52,8 @@ func start(containerID string) (vc.VCSandbox, error) {
"sandbox": sandboxID, "sandbox": sandboxID,
}) })
setExternalLoggers(kataLog)
containerID = status.ID containerID = status.ID
containerType, err := oci.GetContainerType(status.Annotations) containerType, err := oci.GetContainerType(status.Annotations)

2
cli/state.go
View File

@ -36,6 +36,8 @@ instance of a container.`,
func state(containerID string) error { func state(containerID string) error {
kataLog = kataLog.WithField("container", containerID) kataLog = kataLog.WithField("container", containerID)
setExternalLoggers(kataLog)
// Checks the MUST and MUST NOT from OCI runtime specification // Checks the MUST and MUST NOT from OCI runtime specification
status, _, err := getExistingContainerInfo(containerID) status, _, err := getExistingContainerInfo(containerID)
if err != nil { if err != nil {