|
|
@ -111,12 +111,10 @@ func (c *Client) connect(ctx context.Context, caller string) (client *derp.Clien
|
|
|
|
go func() {
|
|
|
|
go func() {
|
|
|
|
select {
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
case <-ctx.Done():
|
|
|
|
log.Printf("XXXX normal")
|
|
|
|
|
|
|
|
// Either timeout fired (handled below), or
|
|
|
|
// Either timeout fired (handled below), or
|
|
|
|
// we're returning via the defer cancel()
|
|
|
|
// we're returning via the defer cancel()
|
|
|
|
// below.
|
|
|
|
// below.
|
|
|
|
case <-c.ctx.Done():
|
|
|
|
case <-c.ctx.Done():
|
|
|
|
log.Printf("XXXX dead2")
|
|
|
|
|
|
|
|
// Propagate a Client.Close call into
|
|
|
|
// Propagate a Client.Close call into
|
|
|
|
// cancelling this context.
|
|
|
|
// cancelling this context.
|
|
|
|
cancel()
|
|
|
|
cancel()
|
|
|
|