summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-04-12 09:36:33 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-04-13 09:42:29 -0400
commite29fee7329446eff9c58da4cde9787749daeb826 (patch)
treebe2b837a3f403d7a26109229cdd10659ceb531ca /libpod
parent481556cbee53fb18e327a71726a0380481ffb767 (diff)
downloadpodman-e29fee7329446eff9c58da4cde9787749daeb826.tar.gz
podman-e29fee7329446eff9c58da4cde9787749daeb826.tar.bz2
podman-e29fee7329446eff9c58da4cde9787749daeb826.zip
Fix message about runtime to show only the actual runtime
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>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/oci_conmon_linux.go2
-rw-r--r--libpod/runtime.go3
2 files changed, 3 insertions, 2 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index f26ca67ce..5e8ed12e7 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -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
}
diff --git a/libpod/runtime.go b/libpod/runtime.go
index d4bb691ef..613651790 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -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 {