Commit13fb3ca

authored

Merge pull request#88 from cdr/close-err

Show network error on unexpected disconnect

2 parents6316e07 +a08956f commit13fb3caCopy full SHA for 13fb3ca

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,10 @@ func runCommand(ctx context.Context, envName string, command string, args []stri`
`126`	`126`	`Env:cmdEnv,`
`127`	`127`	`})`
`128`	`128`	`iferr!=nil {`
	`129`	`+varcloseErr websocket.CloseError`
	`130`	`+ifxerrors.As(err,&closeErr) {`
	`131`	`+returnxerrors.Errorf("network error, is %q online?",envName)`
	`132`	`+}`
`129`	`133`	`returnerr`
`130`	`134`	`}`
`131`	`135`
`@@ -157,10 +161,14 @@ func runCommand(ctx context.Context, envName string, command string, args []stri`
`157`	`161`	`}`
`158`	`162`	`}()`
`159`	`163`	`err=process.Wait()`
`160`		`-iferr!=nil&&xerrors.Is(err,ctx.Err()) {`
`161`		`-returnxerrors.Errorf("network error, is %q online?",envName)`
	`164`	`+iferr!=nil {`
	`165`	`+varcloseErr websocket.CloseError`
	`166`	`+ifxerrors.Is(err,ctx.Err())\|\|xerrors.As(err,&closeErr) {`
	`167`	`+returnxerrors.Errorf("network error, is %q online?",envName)`
	`168`	`+}`
	`169`	`+returnerr`
`162`	`170`	`}`
`163`		`-returnerr`
	`171`	`+returnnil`
`164`	`172`	`}`
`165`	`173`
`166`	`174`	`funcheartbeat(ctx context.Context,c*websocket.Conn,interval time.Duration) {`

Comments

(0)