0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #16283 from nalind/journald-not-nil

Browse source 
Remove unnecessary check for nil CString
This commit is contained in:
Brian Goff 2015-09-14 19:45:36 -04:00
commit a90ed92df0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/logger/journald/read.go
View file

@ -220,10 +220,6 @@ func (s *journald) readLogs(logWatcher *logger.LogWatcher, config logger.ReadCon
}
// Add a match to have the library do the searching for us.
cmatch = C.CString("CONTAINER_ID_FULL=" + s.vars["CONTAINER_ID_FULL"])
if cmatch == nil {
logWatcher.Err <- fmt.Errorf("error reading container ID")
return
}
defer C.free(unsafe.Pointer(cmatch))
rc = C.sd_journal_add_match(j, unsafe.Pointer(cmatch), C.strlen(cmatch))
if rc != 0 {