erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-24 00:28:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix message about runtime to show only the actual runtime

Browse source 
Currently the debug line shows every runtime up until it finds
the correct one, confusing users on which runtime it is using.

Also move missing OCI runtime from containers/conf down to Debug level
and improved the debug message, to not report error.

[NO TESTS NEEDED] Since this is just debug.

Triggered by https://github.com/containers/podman/issues/4854

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-04-12 09:36:33 -04:00
parent 481556cbee
commit e29fee7329
No known key found for this signature in database
GPG key ID: A2DF901DABE2C028
2 changed files with 3 additions and 2 deletions
Show stats 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
}
foundPath = true
logrus.Tracef("found runtime %q", runtime.path)
runtime.path = path
logrus.Debugf("using runtime %q", path)
break
}

3
libpod/runtime.go
View file

@ -389,7 +389,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
// This will allow us to ship configs including optional
// runtimes that might not be installed (crun, kata).
// 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
}
@ -416,6 +416,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
runtime.defaultOCIRuntime = ociRuntime
}
}
logrus.Debugf("Using OCI runtime %q", runtime.defaultOCIRuntime.Path())
// Do we have at least one valid OCI runtime?
if len(runtime.ociRuntimes) == 0 {