Merge pull request #5617 from fidencio/wip/shimv2-debug

mxpv · web-flow · commit f0a32c66dad1 · 2021-06-17T10:08:51.000-07:00
runtime,v2: Enable debug when containerd is on debug+ log level
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -58,7 +58,8 @@ type binary struct {
 
 func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_ *shim, err error) {
 	args := []string{"-id", b.bundle.ID}
-	if logrus.GetLevel() == logrus.DebugLevel {
+	switch logrus.GetLevel() {
+	case logrus.DebugLevel, logrus.TraceLevel:
 		args = append(args, "-debug")
 	}
 	args = append(args, "start")

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ type binary struct {`
`58`	`58`
`59`	`59`	`func (b binary) Start(ctx context.Context, opts types.Any, onClose func()) (_ *shim, err error) {`
`60`	`60`	`args := []string{"-id", b.bundle.ID}`
`61`		`- if logrus.GetLevel() == logrus.DebugLevel {`
	`61`	`+ switch logrus.GetLevel() {`
	`62`	`+ case logrus.DebugLevel, logrus.TraceLevel:`
`62`	`63`	`args = append(args, "-debug")`
`63`	`64`	`}`
`64`	`65`	`args = append(args, "start")`