Merge pull request #1729 from mtaufen/fix-journalctl-leak

Fix journalctl leak
google · Aug 23, 2017 · d937b68 · d937b68
2 parents 48f6b99 + 3190c1c
commit d937b68
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/utils/oomparser/oomparser.go b/utils/oomparser/oomparser.go
@@ -22,6 +22,7 @@ import (
 	"path"
 	"regexp"
 	"strconv"
+	"syscall"
 	"time"
 
 	"github.com/google/cadvisor/utils"
@@ -167,6 +168,9 @@ func (self *OomParser) StreamOoms(outStream chan *OomInstance) {
 
 func callJournalctl() (io.ReadCloser, error) {
 	cmd := exec.Command("journalctl", "-k", "-f")
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Pdeathsig: syscall.SIGKILL,
+	}
 	readcloser, err := cmd.StdoutPipe()
 	if err != nil {
 		return nil, err