status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9149 from joel0/wrap-errors 

Use error wrapping to preserve error type info
This commit is contained in:
Daniel Nephin 2020-11-10 18:27:08 -05:00 committed by hashicorp-ci
parent 76417b2460
commit 52f8ada38e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/pool/pool.go
View File

@ -526,7 +526,7 @@ START:
// Try to get a conn first // Try to get a conn first
conn, err := p.acquire(dc, nodeName, addr) conn, err := p.acquire(dc, nodeName, addr)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("failed to get conn: %v", err) return nil, nil, fmt.Errorf("failed to get conn: %w", err)
} }
// Get a client // Get a client
@ -540,7 +540,7 @@ START:
retries++ retries++
goto START goto START
} }
return nil, nil, fmt.Errorf("failed to start stream: %v", err) return nil, nil, fmt.Errorf("failed to start stream: %w", err)
} }
return conn, client, nil return conn, client, nil
} }
@ -582,14 +582,14 @@ func (p *ConnPool) rpcInsecure(dc string, nodeName string, addr net.Addr, method
var codec rpc.ClientCodec var codec rpc.ClientCodec
conn, _, err := p.dial(dc, nodeName, addr, 0, RPCTLSInsecure) conn, _, err := p.dial(dc, nodeName, addr, 0, RPCTLSInsecure)
if err != nil { if err != nil {
return fmt.Errorf("rpcinsecure error establishing connection: %v", err) return fmt.Errorf("rpcinsecure error establishing connection: %w", err)
} }
codec = msgpackrpc.NewCodecFromHandle(true, true, conn, structs.MsgpackHandle) codec = msgpackrpc.NewCodecFromHandle(true, true, conn, structs.MsgpackHandle)
// Make the RPC call // Make the RPC call
err = msgpackrpc.CallWithCodec(codec, method, args, reply) err = msgpackrpc.CallWithCodec(codec, method, args, reply)
if err != nil { if err != nil {
return fmt.Errorf("rpcinsecure error making call: %v", err) return fmt.Errorf("rpcinsecure error making call: %w", err)
} }
return nil return nil