From 5e86acd591700b1aed1dd4bc3697f294ac11d0f2 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Sun, 10 Mar 2019 15:26:08 -0500
Subject: display logs for multiple containers at the same time

add the ability for users to specify more than one container at a time
while using podman logs.  If more than one container is being displayed,
podman will also prepend a shortened container id of the container on
the log line.

also, enabled the podman-remote logs command during the refactoring of
the above ability.

fixes issue #2219

Signed-off-by: baude <bbaude@redhat.com>
---
 pkg/varlinkapi/containers.go | 54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'pkg/varlinkapi')

diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index fe38a7cdc..3185ba0e9 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"sync"
 	"syscall"
 	"time"
 
@@ -602,3 +603,56 @@ func ContainerStatsToLibpodContainerStats(stats iopodman.ContainerStats) libpod.
 	}
 	return cstats
 }
+
+// GetContainersLogs is the varlink endpoint to obtain one or more container logs
+func (i *LibpodAPI) GetContainersLogs(call iopodman.VarlinkCall, names []string, follow, latest bool, since string, tail int64, timestamps bool) error {
+	var wg sync.WaitGroup
+	if call.WantsMore() {
+		call.Continues = true
+	}
+	sinceTime, err := time.Parse(time.RFC3339Nano, since)
+	if err != nil {
+		return call.ReplyErrorOccurred(err.Error())
+	}
+	options := libpod.LogOptions{
+		Follow:     follow,
+		Since:      sinceTime,
+		Tail:       uint64(tail),
+		Timestamps: timestamps,
+	}
+
+	options.WaitGroup = &wg
+	if len(names) > 1 {
+		options.Multi = true
+	}
+	logChannel := make(chan *libpod.LogLine, int(tail)*len(names)+1)
+	containers, err := shortcuts.GetContainersByContext(false, latest, names, i.Runtime)
+	if err != nil {
+		return call.ReplyErrorOccurred(err.Error())
+	}
+	if err := i.Runtime.Log(containers, &options, logChannel); err != nil {
+		return err
+	}
+	go func() {
+		wg.Wait()
+		close(logChannel)
+	}()
+	for line := range logChannel {
+		call.ReplyGetContainersLogs(newPodmanLogLine(line))
+		if !call.Continues {
+			break
+		}
+
+	}
+	return call.ReplyGetContainersLogs(iopodman.LogLine{})
+}
+
+func newPodmanLogLine(line *libpod.LogLine) iopodman.LogLine {
+	return iopodman.LogLine{
+		Device:       line.Device,
+		ParseLogType: line.ParseLogType,
+		Time:         line.Time.Format(time.RFC3339Nano),
+		Msg:          line.Msg,
+		Cid:          line.CID,
+	}
+}
-- 
cgit v1.2.3-54-g00ecf