浏览代码

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

Remove unnecessary check for nil CString
Brian Goff 9 年之前
父节点
当前提交
a90ed92df0
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      daemon/logger/journald/read.go

+ 0 - 4
daemon/logger/journald/read.go

@@ -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.
 	// Add a match to have the library do the searching for us.
 	cmatch = C.CString("CONTAINER_ID_FULL=" + s.vars["CONTAINER_ID_FULL"])
 	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))
 	defer C.free(unsafe.Pointer(cmatch))
 	rc = C.sd_journal_add_match(j, unsafe.Pointer(cmatch), C.strlen(cmatch))
 	rc = C.sd_journal_add_match(j, unsafe.Pointer(cmatch), C.strlen(cmatch))
 	if rc != 0 {
 	if rc != 0 {