diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-14 09:16:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 09:16:50 -0400 |
| commit | b5e9b30212c8d378d1cbccb096ebde216df50139 (patch) | |
| tree | d479fa7ffe74cf28bb7f6181f72888fa89883e63 /libpod | |
| parent | 96ad84fd5a7648b55556043dc4d251e9c6be1819 (diff) | |
| parent | e29fee7329446eff9c58da4cde9787749daeb826 (diff) | |
| download | podman-b5e9b30212c8d378d1cbccb096ebde216df50139.tar.gz podman-b5e9b30212c8d378d1cbccb096ebde216df50139.tar.bz2 podman-b5e9b30212c8d378d1cbccb096ebde216df50139.zip | |
Merge pull request #9995 from rhatdan/debug
Fix message about runtime to show only the actual runtime
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 3 |
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 3cee7af63..98ca2d5a4 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -385,7 +385,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 } @@ -412,6 +412,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 { |