opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 20:23:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9995 from rhatdan/debug

Browse Source 
Fix message about runtime to show only the actual runtime
This commit is contained in:
OpenShift Merge Robot
2021-04-14 09:16:50 -04:00
committed by GitHub
parent 96ad84fd5a e29fee7329
commit b5e9b30212
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci_conmon_linux.go
View File

@ -130,8 +130,8 @@ func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtime
continue continue
} }
foundPath = true foundPath = true
logrus.Tracef("found runtime %q", runtime.path)
runtime.path = path runtime.path = path
logrus.Debugf("using runtime %q", path)
break break
} }

3
libpod/runtime.go
View File

@ -385,7 +385,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
// This will allow us to ship configs including optional // This will allow us to ship configs including optional
// runtimes that might not be installed (crun, kata). // runtimes that might not be installed (crun, kata).
// Only a infof so default configs don't spec errors. // Only a infof so default configs don't spec errors.
logrus.Infof("Error initializing configured OCI runtime %s: %v", name, err) logrus.Debugf("configured OCI runtime %s initialization failed: %v", name, err)
continue continue
} }
@ -412,6 +412,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
runtime.defaultOCIRuntime = ociRuntime runtime.defaultOCIRuntime = ociRuntime
} }
} }
logrus.Debugf("Using OCI runtime %q", runtime.defaultOCIRuntime.Path())
// Do we have at least one valid OCI runtime? // Do we have at least one valid OCI runtime?
if len(runtime.ociRuntimes) == 0 { if len(runtime.ociRuntimes) == 0 {