summaryrefslogtreecommitdiff
path: root/libpod/oci_conmon_exec_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-03 10:59:33 -0500
committerGitHub <noreply@github.com>2020-12-03 10:59:33 -0500
commit70284b18cc7d4dc478c439cdda60ba64cfec060b (patch)
treee8bdc4217c89c7891116da9977d8e4ec4848bd0e /libpod/oci_conmon_exec_linux.go
parentc675d8a3c6335e495f7e0f055443a7acb63de911 (diff)
parentf00cc25a7c655022785389e6778693c6a7763bdc (diff)
downloadpodman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.gz
podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.bz2
podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.zip
Merge pull request #8479 from rhatdan/log
Drop default log-level from error to warn
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
-rw-r--r--libpod/oci_conmon_exec_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go
index 7068bf87a..f8e7020f7 100644
--- a/libpod/oci_conmon_exec_linux.go
+++ b/libpod/oci_conmon_exec_linux.go
@@ -231,7 +231,7 @@ func (r *ConmonOCIRuntime) ExecStopContainer(ctr *Container, sessionID string, t
// Wait for the PID to stop
if err := waitPidStop(pid, time.Duration(timeout)*time.Second); err != nil {
- logrus.Warnf("Timed out waiting for container %s exec session %s to stop, resorting to SIGKILL", ctr.ID(), sessionID)
+ logrus.Infof("Timed out waiting for container %s exec session %s to stop, resorting to SIGKILL: %v", ctr.ID(), sessionID, err)
} else {
// No error, container is dead
return nil