NRI: use the daemon's logger

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-11-30 17:34:21 +00:00
parent 282868dabf
commit 14906f8023
2 changed files with 31 additions and 0 deletions

View File

@@ -0,0 +1,29 @@
package nri
import (
"context"
"github.com/containerd/log"
nrilog "github.com/containerd/nri/pkg/log"
)
type logShim struct{}
// logShim implements interface nrilog.Logger.
var _ nrilog.Logger = (*logShim)(nil)
func (nls *logShim) Debugf(ctx context.Context, format string, args ...any) {
log.G(ctx).Debugf("NRI: "+format, args...)
}
func (nls *logShim) Infof(ctx context.Context, format string, args ...any) {
log.G(ctx).Infof("NRI: "+format, args...)
}
func (nls *logShim) Warnf(ctx context.Context, format string, args ...any) {
log.G(ctx).Warnf("NRI: "+format, args...)
}
func (nls *logShim) Errorf(ctx context.Context, format string, args ...any) {
log.G(ctx).Errorf("NRI: "+format, args...)
}

View File

@@ -9,6 +9,7 @@ import (
"github.com/containerd/log"
"github.com/containerd/nri/pkg/adaptation"
nrilog "github.com/containerd/nri/pkg/log"
"github.com/moby/moby/v2/daemon/container"
"github.com/moby/moby/v2/daemon/internal/rootless"
"github.com/moby/moby/v2/daemon/pkg/opts"
@@ -57,6 +58,7 @@ func NewNRI(ctx context.Context, cfg Config) (*NRI, error) {
"pluginConfigPath": n.cfg.DaemonConfig.PluginConfigPath,
"socketPath": n.cfg.DaemonConfig.SocketPath,
}).Info("Starting NRI")
nrilog.Set(&logShim{})
var err error
n.nri, err = adaptation.New("docker", dockerversion.Version, n.syncFn, n.updateFn, nriOptions(n.cfg.DaemonConfig)...)