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

Merge pull request #7660 from ashley-cui/logs 

Fix remote logs
This commit is contained in:
OpenShift Merge Robot 2020-09-18 09:46:41 -04:00 committed by GitHub
parent fc3daaef83 e1ac8d9aa2
commit 5b7509c562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/api/handlers/compat/containers_logs.go
View File

@ -105,6 +105,18 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
var frame strings.Builder var frame strings.Builder
header := make([]byte, 8) header := make([]byte, 8)
writeHeader := true
// Docker does not write stream headers iff the container has a tty.
if !utils.IsLibpodRequest(r) {
inspectData, err := ctnr.Inspect(false)
if err != nil {
utils.InternalServerError(w, errors.Wrapf(err, "Failed to obtain logs for Container '%s'", name))
return
}
writeHeader = !inspectData.Config.Tty
}
for line := range logChannel { for line := range logChannel {
if _, found := r.URL.Query()["until"]; found { if _, found := r.URL.Query()["until"]; found {
if line.Time.After(until) { if line.Time.After(until) {
@ -138,10 +150,13 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
} }
frame.WriteString(line.Msg) frame.WriteString(line.Msg)
if writeHeader {
binary.BigEndian.PutUint32(header[4:], uint32(frame.Len())) binary.BigEndian.PutUint32(header[4:], uint32(frame.Len()))
if _, err := w.Write(header[0:8]); err != nil { if _, err := w.Write(header[0:8]); err != nil {
log.Errorf("unable to write log output header: %q", err) log.Errorf("unable to write log output header: %q", err)
} }
}
if _, err := io.WriteString(w, frame.String()); err != nil { if _, err := io.WriteString(w, frame.String()); err != nil {
log.Errorf("unable to write frame string: %q", err) log.Errorf("unable to write frame string: %q", err)
} }