fix: ensure wsep processes are closed (#436)

coadler · web-flow · commit d2df9e124241 · 2021-09-09T16:56:18.000-05:00
diff --git a/internal/sync/singlefile.go b/internal/sync/singlefile.go
@@ -39,6 +39,7 @@ func SingleFile(ctx context.Context, local, remoteDir string, workspace *coder.W
 	if err != nil {
 		return xerrors.Errorf("start sync command: %w", err)
 	}
+	defer process.Close()
 
 	sourceFile, err := os.Open(local)
 	if err != nil {
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -109,6 +109,8 @@ func (s Sync) remoteCmd(ctx context.Context, prog string, args ...string) error
 	if err != nil {
 		return xerrors.Errorf("exec remote process: %w", err)
 	}
+	defer process.Close()
+
 	// NOTE: If the copy routine fail, it will result in `process.Wait` to unblock and report an error.
 	go func() { _, _ = io.Copy(s.OutW, process.Stdout()) }() // Best effort.
 	go func() { _, _ = io.Copy(s.ErrW, process.Stderr()) }() // Best effort.
@@ -290,6 +292,8 @@ func (s Sync) Version() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	defer process.Close()
+
 	buf := &bytes.Buffer{}
 	_, _ = io.Copy(buf, process.Stdout()) // Ignore error, if any, it would be handled by the process.Wait return.
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ func SingleFile(ctx context.Context, local, remoteDir string, workspace *coder.W`
`39`	`39`	`if err != nil {`
`40`	`40`	`return xerrors.Errorf("start sync command: %w", err)`
`41`	`41`	`}`
	`42`	`+ defer process.Close()`
`42`	`43`
`43`	`44`	`sourceFile, err := os.Open(local)`
`44`	`45`	`if err != nil {`