diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-10-15 06:03:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 06:03:57 -0400 |
| commit | b6b3acf2d74958957b40d557bf103072d120213e (patch) | |
| tree | e6e00c9850dd3e084eea2254674e5387655451a2 /libpod/oci_conmon_linux.go | |
| parent | a9190dac36f3f220ddc65ad8295778d40566e61f (diff) | |
| parent | 2d2646883f0b55198eb7f17108a10bbbb5e5c0da (diff) | |
| download | podman-b6b3acf2d74958957b40d557bf103072d120213e.tar.gz podman-b6b3acf2d74958957b40d557bf103072d120213e.tar.bz2 podman-b6b3acf2d74958957b40d557bf103072d120213e.zip | |
Merge pull request #4229 from vrothberg/conmon-no-log-error
change error wording when conmon fails without logs
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index f29758a69..3606a9634 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1359,7 +1359,7 @@ func readConmonPipeData(pipe *os.File, ociLog string) (int, error) { } } } - return -1, errors.Wrapf(ss.err, "error reading container (probably exited) json message") + return -1, errors.Wrapf(ss.err, "container create failed (no logs from conmon)") } logrus.Debugf("Received: %d", ss.si.Data) if ss.si.Data < 0 { |