virtcontainers: Fix structured logging in cgroups package

Call the `pkg/cgroups` package `SetLogger()` function to ensure all its log records contain all required structured logging fields. Fixes: #2782 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Jun 18, 2020 · 5d80f69 · 5d80f69
1 parent 984ccea
commit 5d80f69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/virtcontainers/api.go b/virtcontainers/api.go
@@ -14,6 +14,7 @@ import (
 	deviceApi "github.com/kata-containers/runtime/virtcontainers/device/api"
 	deviceConfig "github.com/kata-containers/runtime/virtcontainers/device/config"
 	"github.com/kata-containers/runtime/virtcontainers/persist"
+	"github.com/kata-containers/runtime/virtcontainers/pkg/cgroups"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/compatoci"
 	vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types"
 	"github.com/kata-containers/runtime/virtcontainers/store"
@@ -53,6 +54,7 @@ func SetLogger(ctx context.Context, logger *logrus.Entry) {
 	compatoci.SetLogger(virtLog)
 	store.SetLogger(virtLog)
 	deviceConfig.SetLogger(virtLog)
+	cgroups.SetLogger(virtLog)
 }
 
 // CreateSandbox is the virtcontainers sandbox creation entry point.

diff --git a/virtcontainers/pkg/cgroups/manager.go b/virtcontainers/pkg/cgroups/manager.go
@@ -59,6 +59,13 @@ var (
 	cgroupsLogger = logrus.WithField("source", "virtcontainers/pkg/cgroups")
 )
 
+// SetLogger sets up a logger for this pkg
+func SetLogger(logger *logrus.Entry) {
+	fields := cgroupsLogger.Data
+
+	cgroupsLogger = logger.WithFields(fields)
+}
+
 func EnableSystemdCgroup() {
 	systemd := true
 	systemdCgroup = &systemd