github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3890 from estesp/printf-to-log

Browse Source 
Use logrus instead of printf for warning
This commit is contained in:
Michael Crosby 2019-12-12 21:02:39 -05:00 committed by GitHub
commit 082f7e3aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/ctr/commands/run/run_unix.go
View File

@ -20,7 +20,6 @@ package run
import ( import (
gocontext "context" gocontext "context"
"fmt"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -34,6 +33,7 @@ import (
"github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -247,14 +247,14 @@ func getNewTaskOpts(context *cli.Context) []containerd.NewTaskOpts {
if uidmap := context.String("uidmap"); uidmap != "" { if uidmap := context.String("uidmap"); uidmap != "" {
uidMap, err := parseIDMapping(uidmap) uidMap, err := parseIDMapping(uidmap)
if err != nil { if err != nil {
fmt.Printf("warning: expected to parse uidmap: %s\n", err.Error()) logrus.WithError(err).Warn("unable to parse uidmap; defaulting to uid 0 IO ownership")
} }
tOpts = append(tOpts, containerd.WithUIDOwner(uidMap.HostID)) tOpts = append(tOpts, containerd.WithUIDOwner(uidMap.HostID))
} }
if gidmap := context.String("gidmap"); gidmap != "" { if gidmap := context.String("gidmap"); gidmap != "" {
gidMap, err := parseIDMapping(gidmap) gidMap, err := parseIDMapping(gidmap)
if err != nil { if err != nil {
fmt.Printf("warning: expected to parse uidmap: %s\n", err.Error()) logrus.WithError(err).Warn("unable to parse gidmap; defaulting to gid 0 IO ownership")
} }
tOpts = append(tOpts, containerd.WithGIDOwner(gidMap.HostID)) tOpts = append(tOpts, containerd.WithGIDOwner(gidMap.HostID))
} }