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

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 {