refactor: move dialer's errorwrapper in i/errorsx (#417)

Part of https://github.com/ooni/probe/issues/1505
This commit is contained in:
Simone Basso 2021-07-01 17:15:44 +02:00 committed by GitHub
commit ceefcaf45e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 26 deletions

View file

@ -1,61 +0,0 @@
package dialer
import (
"context"
"net"
"github.com/ooni/probe-cli/v3/internal/errorsx"
)
// errorWrapperDialer is a dialer that performs err wrapping
type errorWrapperDialer struct {
Dialer
}
// DialContext implements Dialer.DialContext
func (d *errorWrapperDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
conn, err := d.Dialer.DialContext(ctx, network, address)
err = errorsx.SafeErrWrapperBuilder{
Error: err,
Operation: errorsx.ConnectOperation,
}.MaybeBuild()
if err != nil {
return nil, err
}
return &errorWrapperConn{Conn: conn}, nil
}
// errorWrapperConn is a net.Conn that performs error wrapping.
type errorWrapperConn struct {
net.Conn
}
// Read implements net.Conn.Read
func (c *errorWrapperConn) Read(b []byte) (n int, err error) {
n, err = c.Conn.Read(b)
err = errorsx.SafeErrWrapperBuilder{
Error: err,
Operation: errorsx.ReadOperation,
}.MaybeBuild()
return
}
// Write implements net.Conn.Write
func (c *errorWrapperConn) Write(b []byte) (n int, err error) {
n, err = c.Conn.Write(b)
err = errorsx.SafeErrWrapperBuilder{
Error: err,
Operation: errorsx.WriteOperation,
}.MaybeBuild()
return
}
// Close implements net.Conn.Close
func (c *errorWrapperConn) Close() (err error) {
err = c.Conn.Close()
err = errorsx.SafeErrWrapperBuilder{
Error: err,
Operation: errorsx.CloseOperation,
}.MaybeBuild()
return
}