Commit34c5c1a

committed

Avoid wait callback when context expires

1 parentd4170ca commit34c5c1aCopy full SHA for 34c5c1a

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func (rpty *bufferedReconnectingPTY) Attach(ctx context.Context, connID string,`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`ifstate!=StateReady {`
`194`		`-returnxerrors.Errorf("reconnecting pty ready wait: %w",err)`
	`194`	`+returnerr`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`goheartbeat(ctx,rpty.timer,rpty.timeout)`
`@@ -210,7 +210,7 @@ func (rpty *bufferedReconnectingPTY) Attach(ctx context.Context, connID string,`
`210`	`210`	`returnnil`
`211`	`211`	`})`
`212`	`212`	`iferr!=nil {`
`213`		`-returnerr`
	`213`	`+returnxerrors.Errorf("reconnecting pty ready wait: %w",err)`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`deferfunc() {`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,8 @@ func (s *ptyState) waitForState(state State) (State, error) {`
`168`	`168`
`169`	`169`	`// waitForStateOrContext blocks until the state or a greater one is reached or`
`170`	`170`	`// the provided context ends. If fn is non-nil it will be ran while the lock is`
`171`		`-// held and fn's error will replace waitForStateOrContext's error.`
	`171`	`+// held unless the context ends, and fn's error will replace`
	`172`	`+// waitForStateOrContext's error.`
`172`	`173`	`func (s*ptyState)waitForStateOrContext(ctx context.Context,stateState,fnfunc(stateState,errerror)error) (State,error) {`
`173`	`174`	`nevermind:=make(chanstruct{})`
`174`	`175`	`deferclose(nevermind)`
`@@ -186,14 +187,13 @@ func (s *ptyState) waitForStateOrContext(ctx context.Context, state State, fn fu`
`186`	`187`	`forctx.Err()==nil&&state>s.state {`
`187`	`188`	`s.cond.Wait()`
`188`	`189`	`}`
`189`		`-err:=s.error`
`190`	`190`	`ifctx.Err()!=nil {`
`191`		`-err=ctx.Err()`
	`191`	`+returns.state,ctx.Err()`
`192`	`192`	`}`
`193`	`193`	`iffn!=nil {`
`194`		`-returns.state,fn(s.state,err)`
	`194`	`+returns.state,fn(s.state,s.error)`
`195`	`195`	`}`
`196`		`-returns.state,err`
	`196`	`+returns.state,s.error`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`// readConnLoop reads messages from conn and writes to ptty as needed. Blocks`

Comments

(0)