Don't log an error and return it, just return the error with a trace

juju/sockets/sockets_nix.go

@@ -6,6 +6,8 @@ import (
 	"net"
 	"net/rpc"
 	"os"
+
+	"github.com/juju/errors"
 )
 
 func Dial(socketPath string) (*rpc.Client, error) {
@@ -18,9 +20,5 @@ func Listen(socketPath string) (net.Listener, error) {
 		logger.Tracef("ignoring error on removing %q: %v", socketPath, err)
 	}
 	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		logger.Errorf("failed to listen on unix:%s: %v", socketPath, err)
-		return nil, err
-	}
-	return listener, err
+	return listener, errors.Trace(err)
 }

juju/sockets/sockets_windows.go

@@ -4,22 +4,17 @@ import (
 	"net"
 	"net/rpc"
 
+	"github.com/juju/errors"
+
 	"gopkg.in/natefinch/npipe.v2"
 )
 
 func Dial(socketPath string) (*rpc.Client, error) {
 	conn, err := npipe.Dial(socketPath)
-	if err != nil {
-		return nil, err
-	}
-	return rpc.NewClient(conn), nil
+	return rpc.NewClient(conn), errors.Trace(err)
 }
 
 func Listen(socketPath string) (net.Listener, error) {
 	listener, err := npipe.Listen(socketPath)
-	if err != nil {
-		logger.Errorf("failed to listen on:%s: %v", socketPath, err)
-		return nil, err
-	}
-	return listener, err
+	return listener, errors.Trace(err)
 }