Forráskód Böngészése

fix error detection for pipeline

Darien Raymond 7 éve
szülő
commit
48e825567a

+ 2 - 1
common/buf/multi_buffer.go

@@ -3,6 +3,7 @@ package buf
 import (
 	"io"
 	"net"
+	"os"
 
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/errors"
@@ -22,7 +23,7 @@ func ReadAllToMultiBuffer(reader io.Reader) (MultiBuffer, error) {
 			mb.Append(b)
 		}
 		if err != nil {
-			if errors.Cause(err) == io.EOF {
+			if errors.Cause(err) == io.EOF || errors.Cause(err) == os.ErrClosed {
 				return mb, nil
 			}
 			mb.Release()

+ 20 - 4
common/errors/errors.go

@@ -3,6 +3,7 @@ package errors // import "v2ray.com/core/common/errors"
 
 import (
 	"context"
+	"os"
 	"strings"
 
 	"v2ray.com/core/common/log"
@@ -162,12 +163,27 @@ func Cause(err error) error {
 	if err == nil {
 		return nil
 	}
+L:
 	for {
-		inner, ok := err.(hasInnerError)
-		if !ok || inner.Inner() == nil {
-			break
+		switch inner := err.(type) {
+		case hasInnerError:
+			if inner.Inner() == nil {
+				break L
+			}
+			err = inner.Inner()
+		case *os.PathError:
+			if inner.Err == nil {
+				break L
+			}
+			err = inner.Err
+		case *os.SyscallError:
+			if inner.Err == nil {
+				break L
+			}
+			err = inner.Err
+		default:
+			break L
 		}
-		err = inner.Inner()
 	}
 	return err
 }

+ 4 - 4
common/platform/ctlcmd/ctlcmd.go

@@ -16,7 +16,7 @@ import (
 func Run(args []string, input io.Reader) (buf.MultiBuffer, error) {
 	v2ctl := platform.GetToolLocation("v2ctl")
 	if _, err := os.Stat(v2ctl); err != nil {
-		return nil, err
+		return nil, newError("v2ctl doesn't exist").Base(err)
 	}
 
 	errBuffer := &buf.MultiBuffer{}
@@ -30,19 +30,19 @@ func Run(args []string, input io.Reader) (buf.MultiBuffer, error) {
 
 	stdoutReader, err := cmd.StdoutPipe()
 	if err != nil {
-		return nil, err
+		return nil, newError("failed to get stdout from v2ctl").Base(err)
 	}
 	defer stdoutReader.Close()
 
 	if err := cmd.Start(); err != nil {
-		return nil, err
+		return nil, newError("failed to start v2ctl").Base(err)
 	}
 
 	var content buf.MultiBuffer
 	loadTask := func() error {
 		c, err := buf.ReadAllToMultiBuffer(stdoutReader)
 		if err != nil {
-			return err
+			return newError("failed to read config").Base(err)
 		}
 		content = c
 		return nil