virtcontainers: Fix structured logging in device/config package

Call the `device/config` package `SetLogger()` function to ensure all its log records contain all required structured logging fields. Fixes: #2643 Signed-off-by: Julio Montes <[email protected]> (cherry picked from commit d0dbd04)
kata-containers · Jun 3, 2020 · 673b471 · 673b471
1 parent 13887bf
commit 673b471
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/virtcontainers/api.go b/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/virtcontainers/device/config/pmem.go b/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.