Merge pull request #367 from jeremy-gill/journald_unix_socket_leak_fix

Luca Bruno · web-flow · commit 2aca22e193b2 · 2021-04-15T14:13:18.000Z
journal: close unix socket after successful probe
diff --git a/journal/journal_unix.go b/journal/journal_unix.go
@@ -65,9 +65,11 @@ func Enabled() bool {
 		return false
 	}
 
-	if _, err := net.Dial("unixgram", journalSocket); err != nil {
+	conn, err := net.Dial("unixgram", journalSocket)
+	if err != nil {
 		return false
 	}
+	defer conn.Close()
 
 	return true
 }

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,11 @@ func Enabled() bool {`
`65`	`65`	`return false`
`66`	`66`	`}`
`67`	`67`
`68`		`- if _, err := net.Dial("unixgram", journalSocket); err != nil {`
	`68`	`+ conn, err := net.Dial("unixgram", journalSocket)`
	`69`	`+ if err != nil {`
`69`	`70`	`return false`
`70`	`71`	`}`
	`72`	`+ defer conn.Close()`
`71`	`73`
`72`	`74`	`return true`
`73`	`75`	`}`