github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 02:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3034 from weaveworks/very-high-cpu-on-get-logs

Browse Source 
logReadCloser: ensure EOF after `Close()`
This commit is contained in:
Roberto Bruggemann
2018-01-19 15:01:51 +00:00
committed by GitHub
parent f3c1183cd9 9198f6b38b
commit ea0b5499d9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
probe/kubernetes/logreadcloser.go
View File

@@ -84,7 +84,7 @@ func (l *logReadCloser) Read(p []byte) (int, error) {
// check if there's more data to read, without blocking
empty := false
for !empty && l.buffer.Len() < len(p) {
for !empty && l.buffer.Len() < len(p) && !l.isEOF() {
select {
case data := <-l.dataChannel:
l.buffer.Write(data)
@@ -130,7 +130,6 @@ func (l *logReadCloser) readInput(idx int) {
if len(line) > 0 {
l.dataChannel <- l.annotateLine(idx, line)
}
l.eofChannel <- idx
break
}
if err != nil {
@@ -139,6 +138,8 @@ func (l *logReadCloser) readInput(idx int) {
}
l.dataChannel <- l.annotateLine(idx, line)
}
l.eofChannel <- idx
}
func (l *logReadCloser) annotateLine(idx int, line []byte) []byte {