Merge pull request #337 from andrewkroh/bugfix/procs-fd-leak

Fix process monitoring FD leak
elastic · Oct 26, 2015 · 935d381 · 935d381
2 parents c42da7c + 282ebf9
commit 935d381
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file based on the
 ### Backward Compatibility Breaks
 
 ### Bugfixes
+- Close file descriptors used to monitor processes. #337
 
 ### Added
 

diff --git a/procs/procs.go b/procs/procs.go
@@ -168,6 +168,7 @@ func FindPidsByCmdlineGrep(prefix string, process string) ([]int, error) {
 	if err != nil {
 		return pids, fmt.Errorf("Open /proc: %s", err)
 	}
+	defer proc.Close()
 
 	names, err := proc.Readdirnames(0)
 	if err != nil {
@@ -271,6 +272,7 @@ func (proc *ProcessesWatcher) UpdateMap() {
 		logp.Err("Open: %s", err)
 		return
 	}
+	defer file.Close()
 	socks, err := Parse_Proc_Net_Tcp(file)
 	if err != nil {
 		logp.Err("Parse_Proc_Net_Tcp: %s", err)
@@ -365,6 +367,7 @@ func FindSocketsOfPid(prefix string, pid int) (inodes []int64, err error) {
 	if err != nil {
 		return []int64{}, fmt.Errorf("Open: %s", err)
 	}
+	defer procfs.Close()
 	names, err := procfs.Readdirnames(0)
 	if err != nil {
 		return []int64{}, fmt.Errorf("Readdirnames: %s", err)