Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-23 17:28:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: Log output stops if message is too long (#3258) (#4334)

Browse source
This commit is contained in:
Jonathan West 2020-09-15 17:10:52 -04:00 committed by GitHub
parent 3a30a4fc74
commit eb13305984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
server/application/application.go
View file

@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
goio "io"
"reflect"
"sort"
"strconv"
@ -1052,9 +1053,15 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
done := make(chan bool)
gracefulExit := false
go func() {
scanner := bufio.NewScanner(stream)
for scanner.Scan() {
line := scanner.Text()
bufReader := bufio.NewReader(stream)
for {
line, err := bufReader.ReadString('\n')
if err != nil {
// Error or io.EOF
break
}
line = strings.TrimSpace(line) // Remove trailing line ending
parts := strings.Split(line, " ")
logTime, err := time.Parse(time.RFC3339, parts[0])
metaLogTime := metav1.NewTime(logTime)
@ -1074,11 +1081,11 @@ func (s *Server) PodLogs(q *application.ApplicationPodLogsQuery, ws application.
}
}
if gracefulExit {
logCtx.Info("k8s pod logs scanner completed due to closed grpc context")
} else if err := scanner.Err(); err != nil {
logCtx.Warnf("k8s pod logs scanner failed with error: %v", err)
logCtx.Info("k8s pod logs reader completed due to closed grpc context")
} else if err != nil && err != goio.EOF {
logCtx.Warnf("k8s pod logs reader failed with error: %v", err)
} else {
logCtx.Info("k8s pod logs scanner completed with EOF")
logCtx.Info("k8s pod logs reader completed with EOF")
}
close(done)
}()