github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-12 20:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2306 from jodh-intel/fix-compatoci-logger

Browse Source 
compatoci: Add a SetLogger call
This commit is contained in:
Peng Tao
2019-12-05 13:57:38 +08:00
committed by GitHub
parent 84e4d68b13 67f203f1b8
commit 00ff99bcb6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/api.go
View File

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

7
virtcontainers/pkg/compatoci/utils.go
View File

@@ -100,6 +100,13 @@ func containerCapabilities(s compatOCISpec) (specs.LinuxCapabilities, error) {
return c, nil return c, nil
} }
// SetLogger sets up a logger for this pkg
func SetLogger(logger *logrus.Entry) {
fields := ociLog.Data
ociLog = logger.WithFields(fields)
}
// ContainerCapabilities return a LinuxCapabilities for virtcontainer // ContainerCapabilities return a LinuxCapabilities for virtcontainer
func ContainerCapabilities(s compatOCISpec) (specs.LinuxCapabilities, error) { func ContainerCapabilities(s compatOCISpec) (specs.LinuxCapabilities, error) {
if s.Process == nil { if s.Process == nil {