Merge pull request #2620 from baude/multilogs

display logs for multiple containers at the same time

6 files changed, 47 insertions, 44 deletions

diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index d37af70c1..810c5a6f6 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -21,7 +21,6 @@ func getMainCommands() []*cobra.Command {
 		&_psCommand,
 		_loginCommand,
 		_logoutCommand,
-		_logsCommand,
 		_mountCommand,
 		_pauseCommand,
 		_portCommand,
@@ -63,7 +62,6 @@ func getContainerSubCommands() []*cobra.Command {
 		_execCommand,
 		_exportCommand,
 		_killCommand,
-		_logsCommand,
 		_mountCommand,
 		_pauseCommand,
 		_portCommand,
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index ce6ad8883..2e9cedbaa 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -53,6 +53,7 @@ var (
 		_containerExistsCommand,
 		_contInspectSubCommand,
 		_listSubCommand,
+		_logsCommand,
 	}
 )
 
diff --git a/cmd/podman/logs.go b/cmd/podman/logs.go
index c3416fe57..a1b5fb4cc 100644
--- a/cmd/podman/logs.go
+++ b/cmd/podman/logs.go
@@ -1,27 +1,24 @@
 package main
 
 import (
-	"os"
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/pkg/logs"
+	"github.com/containers/libpod/pkg/adapter"
 	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 var (
 	logsCommand     cliconfig.LogsValues
-	logsDescription = `Retrieves logs for a container.
+	logsDescription = `Retrieves logs for one or more containers.
 
   This does not guarantee execution order when combined with podman run (i.e. your run may not have generated any logs at the time you execute podman logs.
 `
 	_logsCommand = &cobra.Command{
-		Use:   "logs [flags] CONTAINER",
+		Use:   "logs [flags] CONTAINER [CONTAINER...]",
 		Short: "Fetch the logs of a container",
 		Long:  logsDescription,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -29,9 +26,19 @@ var (
 			logsCommand.GlobalFlags = MainGlobalOpts
 			return logsCmd(&logsCommand)
 		},
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) > 0 && logsCommand.Latest {
+				return errors.New("no containers can be specified when using 'latest'")
+			}
+			if !logsCommand.Latest && len(args) < 1 {
+				return errors.New("specify at least one container name or ID to log")
+			}
+			return nil
+		},
 		Example: `podman logs ctrID
   podman logs --tail 2 mywebserver
-  podman logs --follow=true --since 10m ctrID`,
+  podman logs --follow=true --since 10m ctrID
+  podman logs mywebserver mydbserver`,
 	}
 )
 
@@ -54,20 +61,14 @@ func init() {
 }
 
 func logsCmd(c *cliconfig.LogsValues) error {
-	var ctr *libpod.Container
 	var err error
 
-	runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)
+	runtime, err := adapter.GetRuntime(&c.PodmanCommand)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
 	defer runtime.Shutdown(false)
 
-	args := c.InputArgs
-	if len(args) != 1 && !c.Latest {
-		return errors.Errorf("'podman logs' requires exactly one container name/ID")
-	}
-
 	sinceTime := time.Time{}
 	if c.Flag("since").Changed {
 		// parse time, error out if something is wrong
@@ -78,7 +79,7 @@ func logsCmd(c *cliconfig.LogsValues) error {
 		sinceTime = since
 	}
 
-	opts := &logs.LogOptions{
+	opts := &libpod.LogOptions{
 		Details:    c.Details,
 		Follow:     c.Follow,
 		Since:      sinceTime,
@@ -86,30 +87,5 @@ func logsCmd(c *cliconfig.LogsValues) error {
 		Timestamps: c.Timestamps,
 	}
 
-	if c.Latest {
-		ctr, err = runtime.GetLatestContainer()
-	} else {
-		ctr, err = runtime.LookupContainer(args[0])
-	}
-	if err != nil {
-		return err
-	}
-
-	logPath := ctr.LogPath()
-
-	state, err := ctr.State()
-	if err != nil {
-		return err
-	}
-
-	// If the log file does not exist yet and the container is in the
-	// Configured state, it has never been started before and no logs exist
-	// Exit cleanly in this case
-	if _, err := os.Stat(logPath); err != nil {
-		if state == libpod.ContainerStateConfigured {
-			logrus.Debugf("Container has not been started, no logs exist yet")
-			return nil
-		}
-	}
-	return logs.ReadLogs(logPath, ctr, opts)
+	return runtime.Log(c, opts)
 }
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 1717e0624..b130f3232 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -45,6 +45,7 @@ var mainCommands = []*cobra.Command{
 	&_inspectCommand,
 	_killCommand,
 	_loadCommand,
+	_logsCommand,
 	podCommand.Command,
 	_pullCommand,
 	_pushCommand,
diff --git a/cmd/podman/search.go b/cmd/podman/search.go
index 5997e144a..a10b9d419 100644
--- a/cmd/podman/search.go
+++ b/cmd/podman/search.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"reflect"
 	"strings"
 
 	"github.com/containers/buildah/pkg/formats"
@@ -79,7 +80,10 @@ func searchCmd(c *cliconfig.SearchValues) error {
 		return err
 	}
 	format := genSearchFormat(c.Format)
-	out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: results[0].HeaderMap()}
+	if len(results) == 0 {
+		return nil
+	}
+	out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: genSearchOutputMap()}
 	formats.Writer(out).Out()
 	return nil
 }
@@ -99,3 +103,16 @@ func searchToGeneric(params []image.SearchResult) (genericParams []interface{})
 	}
 	return genericParams
 }
+
+func genSearchOutputMap() map[string]string {
+	io := image.SearchResult{}
+	v := reflect.Indirect(reflect.ValueOf(io))
+	values := make(map[string]string)
+
+	for i := 0; i < v.NumField(); i++ {
+		key := v.Type().Field(i).Name
+		value := key
+		values[key] = strings.ToUpper(splitCamelCase(value))
+	}
+	return values
+}
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 791790e2e..517a7a2a1 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -19,6 +19,14 @@ type StringResponse (
     message: string
 )
 
+type LogLine (
+    device: string,
+    parseLogType : string,
+    time: string,
+    msg: string,
+    cid: string
+)
+
 # ContainerChanges describes the return struct for ListContainerChanges
 type ContainerChanges (
    changed: []string,
@@ -522,6 +530,8 @@ method ListContainerProcesses(name: string, opts: []string) -> (container: []str
 # capability of varlink if the client invokes it.
 method GetContainerLogs(name: string) -> (container: []string)
 
+method GetContainersLogs(names: []string, follow: bool, latest: bool, since: string, tail: int, timestamps: bool) -> (log: LogLine)
+
 # ListContainerChanges takes a name or ID of a container and returns changes between the container and
 # its base image. It returns a struct of changed, deleted, and added path names.
 method ListContainerChanges(name: string) -> (container: ContainerChanges)