Merge pull request #5760 from vrothberg/v2-logs

podmanV2: implement logs

1 files changed, 48 insertions, 0 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index ccbe6d4fd..1aabb2a6b 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -4,9 +4,11 @@ package abi
 
 import (
 	"context"
+	"fmt"
 	"io/ioutil"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/containers/buildah"
 	"github.com/containers/image/v5/manifest"
@@ -14,6 +16,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/libpod/image"
+	"github.com/containers/libpod/libpod/logs"
 	"github.com/containers/libpod/pkg/checkpoint"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/domain/infra/abi/terminal"
@@ -709,3 +712,48 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	}
 	return &report, nil
 }
+
+func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []string, options entities.ContainerLogsOptions) error {
+	if options.Writer == nil {
+		return errors.New("no io.Writer set for container logs")
+	}
+
+	var wg sync.WaitGroup
+
+	ctrs, err := getContainersByContext(false, options.Latest, containers, ic.Libpod)
+	if err != nil {
+		return err
+	}
+
+	logOpts := &logs.LogOptions{
+		Multi:      len(ctrs) > 1,
+		Details:    options.Details,
+		Follow:     options.Follow,
+		Since:      options.Since,
+		Tail:       options.Tail,
+		Timestamps: options.Timestamps,
+		UseName:    options.Names,
+		WaitGroup:  &wg,
+	}
+
+	chSize := len(ctrs) * int(options.Tail)
+	if chSize <= 0 {
+		chSize = 1
+	}
+	logChannel := make(chan *logs.LogLine, chSize)
+
+	if err := ic.Libpod.Log(ctrs, logOpts, logChannel); err != nil {
+		return err
+	}
+
+	go func() {
+		wg.Wait()
+		close(logChannel)
+	}()
+
+	for line := range logChannel {
+		fmt.Fprintln(options.Writer, line.String(logOpts))
+	}
+
+	return nil
+}