github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-05 17:02:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3968 from christoph-zededa/fix_logread_socket_closed_too_early

Browse Source 
logread: do not close socket too early
This commit is contained in:
Avi Deitcher
2023-12-18 06:33:32 -08:00
committed by GitHub
parent 3a0405298a cc374a5ea8
commit 59245e88e8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/memlogd/cmd/logread/main.go
View File

@@ -67,7 +67,6 @@ func StreamLogs(socketPath string, follow, dump bool) (<-chan LogEntry, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer conn.Close()
var n int var n int
switch { switch {
@@ -85,6 +84,7 @@ func StreamLogs(socketPath string, follow, dump bool) (<-chan LogEntry, error) {
c := make(chan LogEntry) c := make(chan LogEntry)
go func(c chan<- LogEntry) { go func(c chan<- LogEntry) {
defer conn.Close()
var ( var (
entry LogEntry entry LogEntry
decoder = json.NewDecoder(conn) decoder = json.NewDecoder(conn)