From eed66021daa2575ce49d0fe74a31d40a839dd602 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 23 Jun 2020 00:48:35 -0700 Subject: [PATCH] virtcontainers: Fix structured logging in device/config package [cherry picked from runtime commit d0dbd0485d2f4ec3760f6fa1252ded86a7709042] Call the `device/config` package `SetLogger()` function to ensure all its log records contain all required structured logging fields. Signed-off-by: Julio Montes Signed-off-by: Peng Tao --- src/runtime/virtcontainers/api.go | 1 + src/runtime/virtcontainers/device/config/pmem.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/runtime/virtcontainers/api.go b/src/runtime/virtcontainers/api.go index a4ccaf9646..7793ad7630 100644 --- a/src/runtime/virtcontainers/api.go +++ b/src/runtime/virtcontainers/api.go @@ -52,6 +52,7 @@ func SetLogger(ctx context.Context, logger *logrus.Entry) { deviceApi.SetLogger(virtLog) compatoci.SetLogger(virtLog) store.SetLogger(virtLog) + deviceConfig.SetLogger(virtLog) } // CreateSandbox is the virtcontainers sandbox creation entry point. diff --git a/src/runtime/virtcontainers/device/config/pmem.go b/src/runtime/virtcontainers/device/config/pmem.go index c016dc0867..db52951385 100644 --- a/src/runtime/virtcontainers/device/config/pmem.go +++ b/src/runtime/virtcontainers/device/config/pmem.go @@ -29,6 +29,13 @@ var ( pmemLog = logrus.WithField("source", "virtcontainers/device/config") ) +// SetLogger sets up a logger for this pkg +func SetLogger(logger *logrus.Entry) { + fields := pmemLog.Data + + pmemLog = logger.WithFields(fields) +} + // PmemDeviceInfo returns a DeviceInfo if a loop device // is mounted on source, and the backing file of the loop device // has the PFN signature.