Commit885a2f1

committed

fix close

1 parentfc3e193 commit885a2f1Copy full SHA for 885a2f1

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"bufio"`
`5`	`5`	`"context"`
`6`	`6`	`"encoding/json"`
	`7`	`+"fmt"`
`7`	`8`	`"io"`
`8`	`9`	`"os"`
`9`	`10`	`"strings"`
`@@ -191,20 +192,26 @@ func handleRPTY(inv serpent.Invocation, client codersdk.Client, args handleRPT`
`191`	`192`	`}`
`192`	`193`	`}()`
`193`	`194`	`gofunc() {`
`194`		`-deferclose(stdoutDone)`
	`195`	`+deferfunc() {`
	`196`	`+close(stdoutDone)`
	`197`	`+}()`
`195`	`198`	`_,_=io.Copy(inv.Stdout,conn)`
`196`	`199`	`}()`
`197`	`200`	`gofunc() {`
`198`		`-deferclose(stderrDone)`
	`201`	`+deferfunc() {`
	`202`	`+close(stderrDone)`
	`203`	`+}()`
`199`	`204`	`_,_=io.Copy(inv.Stderr,conn)`
`200`	`205`	`}()`
`201`	`206`	`gofunc() {`
`202`	`207`	`deferclose(done)`
`203`		`-<-inv.Context().Done()`
	`208`	`+<-stdoutDone`
	`209`	`+<-stderrDone`
`204`	`210`	`_=conn.Close()`
`205`	`211`	`}()`
`206`	`212`
`207`	`213`	`<-done`
	`214`	`+_,_=fmt.Fprintf(inv.Stderr,"Connection closed\n")`
`208`	`215`
`209`	`216`	`returnnil`
`210`	`217`	`}`

Comments

(0)