docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #31263 from nalind/journal-doublefree

Browse Source 
Synchronize the cursor returned by followJournal
Upstream-commit: b3e7f7013719be7d11d513335ff55802eaf543ce
Component: engine
This commit is contained in:
Alexander Morozov
2017-02-22 17:45:49 -08:00
committed by GitHub
parent 95c81c945e 53075c0a1f
commit 4fcd45b6de
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/daemon/logger/journald/read.go
View File

@@ -249,6 +249,8 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, config logger.Re
s.readers.readers[logWatcher] = logWatcher
s.readers.mu.Unlock()
newCursor := make(chan *C.char)
go func() {
for {
// Keep copying journal data out until we're notified to stop
@@ -276,6 +278,7 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, config logger.Re
delete(s.readers.readers, logWatcher)
s.readers.mu.Unlock()
close(logWatcher.Msg)
newCursor <- cursor
}()
// Wait until we're told to stop.
@@ -285,6 +288,8 @@ func (s *journald) followJournal(logWatcher *logger.LogWatcher, config logger.Re
C.close(pfd[1])
}
cursor = <-newCursor
return cursor
}