lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

fix error detection for pipeline

Browse Source
This commit is contained in:
Darien Raymond 2018-04-13 11:25:41 +02:00
parent ccafce3c9b
commit 48e825567a
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/buf/multi_buffer.go
View File

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

22
common/errors/errors.go
View File

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

8
common/platform/ctlcmd/ctlcmd.go
View File

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