fix errorChan leak

0xJacky · 0xJacky · commit d8636b76ca52 · 2022-07-06T22:48:21.000+08:00
diff --git a/server/tool/pty/pipeline.go b/server/tool/pty/pipeline.go
@@ -46,7 +46,9 @@ func (p *Pipeline) ReadWsAndWritePty(errorChan chan error) {
 			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNoStatusReceived,
 				websocket.CloseNormalClosure) {
 				errorChan <- errors.Wrap(err, "Error ReadWsAndWritePty unexpected close")
+				return
 			}
+			errorChan <- err
 			return
 		}
 		if msgType != websocket.TextMessage {
@@ -118,7 +120,9 @@ func (p *Pipeline) ReadPtyAndWriteWs(errorChan chan error) {
 		if err != nil {
 			if websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {
 				errorChan <- errors.Wrap(err, "Error ReadPtyAndWriteWs websocket write")
+				return
 			}
+			errorChan <- err
 			return
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ func (p *Pipeline) ReadWsAndWritePty(errorChan chan error) {`
`46`	`46`	`if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseNoStatusReceived,`
`47`	`47`	`websocket.CloseNormalClosure) {`
`48`	`48`	`errorChan <- errors.Wrap(err, "Error ReadWsAndWritePty unexpected close")`
	`49`	`+ return`
`49`	`50`	`}`
	`51`	`+ errorChan <- err`
`50`	`52`	`return`
`51`	`53`	`}`
`52`	`54`	`if msgType != websocket.TextMessage {`
`@@ -118,7 +120,9 @@ func (p *Pipeline) ReadPtyAndWriteWs(errorChan chan error) {`
`118`	`120`	`if err != nil {`
`119`	`121`	`if websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {`
`120`	`122`	`errorChan <- errors.Wrap(err, "Error ReadPtyAndWriteWs websocket write")`
	`123`	`+ return`
`121`	`124`	`}`
	`125`	`+ errorChan <- err`
`122`	`126`	`return`
`123`	`127`	`}`
`124`	`128`	`}`