From 2ca867da7bb1088a25370a7aed220c17b929ed92 Mon Sep 17 00:00:00 2001 From: Snir Sheriber Date: Thu, 26 Aug 2021 15:54:26 +0300 Subject: [PATCH] runtime: Add container field to logs and unified field naming Signed-off-by: Snir Sheriber Backport from commit 0c7789fad6586cfab55127fb7c7902ddd9184052 Signed-off-by: Christophe de Dinechin --- src/runtime/virtcontainers/sandbox.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/virtcontainers/sandbox.go b/src/runtime/virtcontainers/sandbox.go index b545aae82e..0ea618d9b2 100644 --- a/src/runtime/virtcontainers/sandbox.go +++ b/src/runtime/virtcontainers/sandbox.go @@ -729,7 +729,7 @@ func (s *Sandbox) Delete(ctx context.Context) error { for _, c := range s.containers { if err := c.delete(ctx); err != nil { - s.Logger().WithError(err).WithField("cid", c.id).Debug("failed to delete container") + s.Logger().WithError(err).WithField("container`", c.id).Debug("failed to delete container") } } @@ -1293,7 +1293,7 @@ func (s *Sandbox) CreateContainer(ctx context.Context, contConfig ContainerConfi defer func() { // Rollback if error happens. if err != nil { - logger := s.Logger().WithFields(logrus.Fields{"container-id": c.id, "sandox-id": s.id, "rollback": true}) + logger := s.Logger().WithFields(logrus.Fields{"container": c.id, "sandbox": s.id, "rollback": true}) logger.WithError(err).Error("Cleaning up partially created container") if errStop := c.stop(ctx, true); errStop != nil { @@ -1340,7 +1340,7 @@ func (s *Sandbox) StartContainer(ctx context.Context, containerID string) (VCCon return nil, err } - s.Logger().Info("Container is started") + s.Logger().WithField("container", containerID).Info("Container is started") // Update sandbox resources in case a stopped container // is started @@ -2027,7 +2027,7 @@ func (s *Sandbox) calculateSandboxMemory() (int64, bool, int64) { for _, c := range s.config.Containers { // Do not hot add again non-running containers resources if cont, ok := s.containers[c.ID]; ok && cont.state.State == types.StateStopped { - s.Logger().WithField("container-id", c.ID).Debug("Do not taking into account memory resources of not running containers") + s.Logger().WithField("container", c.ID).Debug("Do not taking into account memory resources of not running containers") continue } @@ -2064,7 +2064,7 @@ func (s *Sandbox) calculateSandboxCPUs() (uint32, error) { for _, c := range s.config.Containers { // Do not hot add again non-running containers resources if cont, ok := s.containers[c.ID]; ok && cont.state.State == types.StateStopped { - s.Logger().WithField("container-id", c.ID).Debug("Do not taking into account CPU resources of not running containers") + s.Logger().WithField("container", c.ID).Debug("Do not taking into account CPU resources of not running containers") continue }