18790: Sort lines by timestamp before displaying a chunk.

[arvados.git] / cmd / arvados-client / container_gateway.go

diff --git a/cmd/arvados-client/container_gateway.go b/cmd/arvados-client/container_gateway.go
index 36c376e5c097371cd3a1a0cc07ecc770209047e4..b5f45199d6cb2e6eb44d6beb5dd1c27d4e9e71a0 100644 (file)
--- a/cmd/arvados-client/container_gateway.go
+++ b/cmd/arvados-client/container_gateway.go
@@ -16,6 +16,7 @@ import (
        "os"
        "os/exec"
        "path/filepath"
+       "sort"
        "strings"
        "syscall"
        "time"
@@ -270,16 +271,14 @@ func (lc *logsCommand) copyRange(ctx context.Context, uuid, fnm, byterange strin
 // exit.
 func (lc *logsCommand) display(out, stderr io.Writer, watching []string, received map[string]*bytes.Buffer) bool {
        checkState := false
+       var sorted []string
        for _, fnm := range watching {
                buf := received[fnm]
                if buf == nil || buf.Len() == 0 {
                        continue
                }
                for _, line := range bytes.Split(bytes.TrimSuffix(buf.Bytes(), []byte{'\n'}), []byte{'\n'}) {
-                       _, err := fmt.Fprintf(out, "%-14s %s\n", fnm, line)
-                       if err != nil {
-                               fmt.Fprintln(stderr, err)
-                       }
+                       sorted = append(sorted, fmt.Sprintf("%-14s %s\n", fnm, line))
                        if fnm == "crunch-run.txt" {
                                checkState = checkState ||
                                        bytes.HasSuffix(line, []byte("Complete")) ||
@@ -288,6 +287,15 @@ func (lc *logsCommand) display(out, stderr io.Writer, watching []string, receive
                        }
                }
        }
+       sort.Slice(sorted, func(i, j int) bool {
+               return sorted[i][15:] < sorted[j][15:]
+       })
+       for _, s := range sorted {
+               _, err := fmt.Fprint(out, s)
+               if err != nil {
+                       fmt.Fprintln(stderr, err)
+               }
+       }
        return checkState
 }