github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: Fix structured logging in cgroups package

Browse Source 
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 <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2020-06-23 06:58:47 -05:00
parent 7d2a67340b
commit 0ca5983fdf
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/api.go
View File

@ -14,6 +14,7 @@ import (
deviceApi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/api" deviceApi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/api"
deviceConfig "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config" deviceConfig "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cgroups"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/compatoci" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/compatoci"
vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types" vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/store" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/store"
@ -53,6 +54,7 @@ func SetLogger(ctx context.Context, logger *logrus.Entry) {
compatoci.SetLogger(virtLog) compatoci.SetLogger(virtLog)
store.SetLogger(virtLog) store.SetLogger(virtLog)
deviceConfig.SetLogger(virtLog) deviceConfig.SetLogger(virtLog)
cgroups.SetLogger(virtLog)
} }
// CreateSandbox is the virtcontainers sandbox creation entry point. // CreateSandbox is the virtcontainers sandbox creation entry point.

7
src/runtime/virtcontainers/pkg/cgroups/manager.go
View File

@ -59,6 +59,13 @@ var (
cgroupsLogger = logrus.WithField("source", "virtcontainers/pkg/cgroups") 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() { func EnableSystemdCgroup() {
systemd := true systemd := true
systemdCgroup = &systemd systemdCgroup = &systemd