提交 6f76129b 作者: rht

Simplify context canceled err message

License: MIT
Signed-off-by: 's avatarrht <rhtbot@gmail.com>
上级 72e98deb
...@@ -39,6 +39,7 @@ var log = logging.Logger("cmd/ipfs") ...@@ -39,6 +39,7 @@ var log = logging.Logger("cmd/ipfs")
var ( var (
errUnexpectedApiOutput = errors.New("api returned unexpected output") errUnexpectedApiOutput = errors.New("api returned unexpected output")
errApiVersionMismatch = errors.New("api version mismatch") errApiVersionMismatch = errors.New("api version mismatch")
errRequestCanceled = errors.New("request canceled")
) )
const ( const (
...@@ -328,7 +329,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd ...@@ -328,7 +329,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd
if isConnRefused(err) { if isConnRefused(err) {
err = repo.ErrApiNotRunning err = repo.ErrApiNotRunning
} }
return nil, err return nil, wrapContextCanceled(err)
} }
} else { } else {
...@@ -625,3 +626,10 @@ func isConnRefused(err error) bool { ...@@ -625,3 +626,10 @@ func isConnRefused(err error) bool {
return netoperr.Op == "dial" return netoperr.Op == "dial"
} }
func wrapContextCanceled(err error) error {
if strings.Contains(err.Error(), "request canceled") {
err = errRequestCanceled
}
return err
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论