From f51e0d0597757da72fd7a10085998052684e396b Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Wed, 20 May 2020 14:24:18 -0700
Subject: V2 enable remote logs and testing

* wire up bindings and handler for obtaining logs remotely
* enable debug logging from podman in e2e test using DEBUG and
  DEBUG_SERVICE env variables
* Fix error in streaming log frames
* enable remote logs test

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 pkg/api/handlers/compat/containers.go | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'pkg/api/handlers')

diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 239e41af4..cea4bd0f6 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
@@ -295,7 +296,9 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	w.WriteHeader(http.StatusOK)
-	var builder strings.Builder
+
+	var frame strings.Builder
+	header := make([]byte, 8)
 	for ok := true; ok; ok = query.Follow {
 		for line := range logChannel {
 			if _, found := r.URL.Query()["until"]; found {
@@ -304,10 +307,8 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 				}
 			}
 
-			// Reset variables we're ready to loop again
-			builder.Reset()
-			header := [8]byte{}
-
+			// Reset buffer we're ready to loop again
+			frame.Reset()
 			switch line.Device {
 			case "stdout":
 				if !query.Stdout {
@@ -327,17 +328,17 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 			}
 
 			if query.Timestamps {
-				builder.WriteString(line.Time.Format(time.RFC3339))
-				builder.WriteRune(' ')
+				frame.WriteString(line.Time.Format(time.RFC3339))
+				frame.WriteString(" ")
 			}
-			builder.WriteString(line.Msg)
-			// Build header and output entry
-			binary.BigEndian.PutUint32(header[4:], uint32(len(header)+builder.Len()))
-			if _, err := w.Write(header[:]); err != nil {
+			frame.WriteString(line.Msg)
+
+			binary.BigEndian.PutUint32(header[4:], uint32(frame.Len()))
+			if _, err := w.Write(header[0:8]); err != nil {
 				log.Errorf("unable to write log output header: %q", err)
 			}
-			if _, err := fmt.Fprint(w, builder.String()); err != nil {
-				log.Errorf("unable to write builder string: %q", err)
+			if _, err := io.WriteString(w, frame.String()); err != nil {
+				log.Errorf("unable to write frame string: %q", err)
 			}
 			if flusher, ok := w.(http.Flusher); ok {
 				flusher.Flush()
-- 
cgit v1.2.3-54-g00ecf