containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4229 from vrothberg/conmon-no-log-error 

change error wording when conmon fails without logs
This commit is contained in:
Daniel J Walsh 2019-10-15 06:03:57 -04:00 committed by GitHub
parent a9190dac36 2d2646883f
commit b6b3acf2d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci_conmon_linux.go
View File

@ -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) logrus.Debugf("Received: %d", ss.si.Data)
if ss.si.Data < 0 { if ss.si.Data < 0 {