tangled.org
Monorepo for Tangled
tangled.org
knotserver/git: wait for git cmd to complete after streaming output
could be a source of zombie processes.
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+21
-2
knotserver/git/last_commit.go
+21
-2
knotserver/git/last_commit.go
···
30
30
commitCache = cache
31
31
}
32
32
33
-
func (g *GitRepo) streamingGitLog(ctx context.Context, extraArgs ...string) (io.Reader, error) {
33
+
// processReader wraps a reader and ensures the associated process is cleaned up
34
+
type processReader struct {
35
+
io.Reader
36
+
cmd *exec.Cmd
37
+
stdout io.ReadCloser
38
+
}
39
+
40
+
func (pr *processReader) Close() error {
41
+
if err := pr.stdout.Close(); err != nil {
42
+
return err
43
+
}
44
+
return pr.cmd.Wait()
45
+
}
46
+
47
+
func (g *GitRepo) streamingGitLog(ctx context.Context, extraArgs ...string) (io.ReadCloser, error) {
34
48
args := []string{}
35
49
args = append(args, "log")
36
50
args = append(args, g.h.String())
···
48
62
return nil, err
49
63
}
50
64
51
-
return stdout, nil
65
+
return &processReader{
66
+
Reader: stdout,
67
+
cmd: cmd,
68
+
stdout: stdout,
69
+
}, nil
52
70
}
53
71
54
72
type commit struct {
···
104
122
if err != nil {
105
123
return nil, err
106
124
}
125
+
defer output.Close() // Ensure the git process is properly cleaned up
107
126
108
127
reader := bufio.NewReader(output)
109
128
var current commit