Merge pull request #170 from kinvolk/iaguis/libsystemd-map-dont-close

lucab · lucab · commit 6dc8b843c670 · 2016-06-07T18:02:09.000+02:00
sdjournal: don't close libsystemd on Close()
diff --git a/sdjournal/journal.go b/sdjournal/journal.go
@@ -466,7 +466,9 @@ func (j *Journal) Close() error {
 	C.my_sd_journal_close(sd_journal_close, j.cjournal)
 	j.mu.Unlock()
 
-	return j.lib.Close()
+	// we don't close the handle to reuse the symbol cache between Journal
+	// instances. It will go away when the process exits.
+	return nil
 }
 
 // AddMatch adds a match by which to filter the entries of the journal.

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,9 @@ func (j *Journal) Close() error {`
`466`	`466`	`C.my_sd_journal_close(sd_journal_close, j.cjournal)`
`467`	`467`	`j.mu.Unlock()`
`468`	`468`
`469`		`- return j.lib.Close()`
	`469`	`+ // we don't close the handle to reuse the symbol cache between Journal`
	`470`	`+ // instances. It will go away when the process exits.`
	`471`	`+ return nil`
`470`	`472`	`}`
`471`	`473`
`472`	`474`	`// AddMatch adds a match by which to filter the entries of the journal.`