Commitd2df9e1

authored

fix: ensure wsep processes are closed (#436)

1 parentedf70b9 commitd2df9e1Copy full SHA for d2df9e1

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

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`	`iferr!=nil {`
`40`	`40`	`returnxerrors.Errorf("start sync command: %w",err)`
`41`	`41`	`}`
	`42`	`+deferprocess.Close()`
`42`	`43`
`43`	`44`	`sourceFile,err:=os.Open(local)`
`44`	`45`	`iferr!=nil {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ func (s Sync) remoteCmd(ctx context.Context, prog string, args ...string) error`
`109`	`109`	`iferr!=nil {`
`110`	`110`	`returnxerrors.Errorf("exec remote process: %w",err)`
`111`	`111`	`}`
	`112`	`+deferprocess.Close()`
	`113`	`+`
`112`	`114`	// NOTE: If the copy routine fail, it will result in `process.Wait` to unblock and report an error.
`113`	`115`	`gofunc() {_,_=io.Copy(s.OutW,process.Stdout()) }()// Best effort.`
`114`	`116`	`gofunc() {_,_=io.Copy(s.ErrW,process.Stderr()) }()// Best effort.`
`@@ -290,6 +292,8 @@ func (s Sync) Version() (string, error) {`
`290`	`292`	`iferr!=nil {`
`291`	`293`	`return"",err`
`292`	`294`	`}`
	`295`	`+deferprocess.Close()`
	`296`	`+`
`293`	`297`	`buf:=&bytes.Buffer{}`
`294`	`298`	`_,_=io.Copy(buf,process.Stdout())// Ignore error, if any, it would be handled by the process.Wait return.`
`295`	`299`

Comments

(0)