make codegen

cmd/argo/commands/logs.go

@@ -6,7 +6,6 @@ import (
  "math"
  "os"
  "strings"
- "sync"
  "time"
 
  "github.com/argoproj/pkg/errors"
@@ -16,12 +15,10 @@ import (
 
  "github.com/argoproj/argo/cmd/argo/commands/client"
  workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
- "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 )
 
 func NewLogsCommand() *cobra.Command {
  var (
- workflow bool
  since time.Duration
  sinceTime string
  tailLines int64
@@ -30,21 +27,35 @@ func NewLogsCommand() *cobra.Command {
  var command = &cobra.Command{
  Use: "logs POD|WORKFLOW",
  Short: "view logs of a pod or workflow",
- Example: `# Follow the logs of single container in a pod
+ Example: `# Follow the logs of a workflow:
 
- argo logs my-pod -c my-container
+ argo logs my-wf
+
+# Follow the logs of single container in a pod
+
+ argo logs my-wf my-pod -c my-container
 
 # Follow the logs of a workflow's pods:
 
- argo logs -w my-wf
+ argo logs my-wf my-pod
 
 # Follow the logs of a pods:
 
  argo logs --since=1h my-pod
 
 `,
  Run: func(cmd *cobra.Command, args []string) {
- if len(args) == 0 {
+
+ workflow := args[0]
+ podName := ""
+
+ switch len(args) {
+ case 1:
+ break
+ case 2:
+ podName = args[1]
+ break
+ default:
  cmd.HelpFunc()(cmd, args)
  os.Exit(1)
  }
@@ -62,88 +73,55 @@ func NewLogsCommand() *cobra.Command {
  logOptions.SinceTime = &sinceTime
  }
 
- // get all the pods we need to list
- var podNames []string
-
  ctx, apiClient := client.NewAPIClient()
  serviceClient := apiClient.NewWorkflowServiceClient()
  namespace := client.Namespace()
- if workflow {
- // this can (original implementation too) only follow logs for the pods for the workflow
- wf, err := serviceClient.GetWorkflow(ctx, &workflowpkg.WorkflowGetRequest{
- Name: args[0],
- Namespace: namespace,
- })
- errors.CheckError(err)
- for nodeId, node := range wf.Status.Nodes {
- if node.Type == v1alpha1.NodeTypePod && node.Phase != v1alpha1.NodeError {
- podNames = append(podNames, nodeId)
- }
- }
- } else {
- podNames = args
- }
-
- // now follow
- var wg sync.WaitGroup
- wg.Add(len(podNames))
- for _, podName := range podNames {
- format := "%s: %s"
- // only print pod names if we have more than one
- if len(podNames) > 0 {
- format = fmt.Sprintf("%s %s", podName, format)
- }
 
- // color output on pod name
- colors := []int{FgRed, FgGreen, FgYellow, FgBlue, FgMagenta, FgCyan, FgWhite, FgDefault}
- h := fnv.New32a()
- _, err := h.Write([]byte(podName))
- errors.CheckError(err)
- colorIndex := int(math.Mod(float64(h.Sum32()), float64(len(colors))))
-
- go func(podName string) {
- defer wg.Done()
- // this outer loop allows us to retry when we can't find pods
- for {
- var logStream workflowpkg.WorkflowService_PodLogsClient
- // keep trying to get the pod logs
- for {
- logStream, err = serviceClient.PodLogs(ctx, &workflowpkg.WorkflowLogRequest{
- Namespace: namespace,
- PodName: podName,
- LogOptions: &logOptions,
- })
- if err != nil {
- _, _ = fmt.Fprintln(os.Stderr, err.Error())
- if strings.Contains(err.Error(), "ContainerCreating") {
- time.Sleep(3 * time.Second)
- continue // try again in 3s
- }
- return // give up
- }
- break // all good - lets start tailing
+ // color output on pod name
+ colors := []int{FgRed, FgGreen, FgYellow, FgBlue, FgMagenta, FgCyan, FgWhite, FgDefault}
+ h := fnv.New32a()
+ _, err := h.Write([]byte(podName))
+ errors.CheckError(err)
+ colorIndex := int(math.Mod(float64(h.Sum32()), float64(len(colors))))
+
+ // this outer loop allows us to retry when we can't find pods
+ for {
+ var logStream workflowpkg.WorkflowService_PodLogsClient
+ // keep trying to get the pod logs
+ for {
+ logStream, err = serviceClient.PodLogs(ctx, &workflowpkg.WorkflowLogRequest{
+ Name: workflow,
+ Namespace: namespace,
+ PodName: podName,
+ LogOptions: &logOptions,
+ })
+ if err != nil {
+ _, _ = fmt.Fprintln(os.Stderr, err.Error())
+ if strings.Contains(err.Error(), "ContainerCreating") {
+ time.Sleep(3 * time.Second)
+ continue // try again in 3s
  }
- // loop on log lines
-  for {
-  event, err := logStream.Recv()
-  if err != nil {
-  _, _ = fmt.Fprintln(os.Stderr, err.Error())
-  if strings.Contains(err.Error(), "waiting to start") {
-  time.Sleep(3 * time.Second)
-  break // break out of logging loop so we try to connect again in 3s
-  }
-  return // give up
- }
- fmt.Println(ansiFormat(fmt.Sprintf(format, podName, event.Content), colors[colorIndex]))
+ return // give up
+ }
+ break // all good - lets start tailing
+ }
+ // loop on log lines
+ for {
+ event, err := logStream.Recv()
+ if err != nil {
+ _, _ = fmt.Fprintln(os.Stderr, err.Error())
+ if strings.Contains(err.Error(), "waiting to start") {
+ time.Sleep(3 * time.Second)
+ break // break out of logging loop so we try to connect again in 3s
  }
+ return // give up
  }
- }(podName)
+ fmt.Println(ansiFormat(fmt.Sprintf("%s %s", event.PodName, event.Content), colors[colorIndex]))
+ }
  }
- wg.Wait()
  },
  }
  command.Flags().StringVarP(&logOptions.Container, "container", "c", "main", "Print the logs of this container")
- command.Flags().BoolVarP(&workflow, "workflow", "w", false, "Specify that whole workflow logs should be printed")
  command.Flags().BoolVarP(&logOptions.Follow, "follow", "f", false, "Specify if the logs should be streamed.")
  command.Flags().DurationVar(&since, "since", 0, "Only return logs newer than a relative duration like 5s, 2m, or 3h. Defaults to all logs. Only one of since-time / since may be used.")
  command.Flags().StringVar(&sinceTime, "since-time", "", "Only return logs after a specific date (RFC3339). Defaults to all logs. Only one of since-time / since may be used.")