Merge pull request #3051 from chengzhichao-xydt/codex/error-wrap-percent-w
fix: use %w instead of %v for error wrapping in channels and mcp
This commit is contained in:
commit
12c36572a5
2 changed files with 6 additions and 6 deletions
|
|
@ -11,11 +11,11 @@ import (
|
||||||
func ClassifySendError(statusCode int, rawErr error) error {
|
func ClassifySendError(statusCode int, rawErr error) error {
|
||||||
switch {
|
switch {
|
||||||
case statusCode == http.StatusTooManyRequests:
|
case statusCode == http.StatusTooManyRequests:
|
||||||
return fmt.Errorf("%w: %v", ErrRateLimit, rawErr)
|
return fmt.Errorf("%w: %w", ErrRateLimit, rawErr)
|
||||||
case statusCode >= 500:
|
case statusCode >= 500:
|
||||||
return fmt.Errorf("%w: %v", ErrTemporary, rawErr)
|
return fmt.Errorf("%w: %w", ErrTemporary, rawErr)
|
||||||
case statusCode >= 400:
|
case statusCode >= 400:
|
||||||
return fmt.Errorf("%w: %v", ErrSendFailed, rawErr)
|
return fmt.Errorf("%w: %w", ErrSendFailed, rawErr)
|
||||||
default:
|
default:
|
||||||
return rawErr
|
return rawErr
|
||||||
}
|
}
|
||||||
|
|
@ -26,5 +26,5 @@ func ClassifyNetError(err error) error {
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return fmt.Errorf("%w: %v", ErrTemporary, err)
|
return fmt.Errorf("%w: %w", ErrTemporary, err)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (s *isolatedPipeRWC) Write(p []byte) (n int, err error) {
|
||||||
|
|
||||||
func (s *isolatedPipeRWC) Close() error {
|
func (s *isolatedPipeRWC) Close() error {
|
||||||
if err := s.stdin.Close(); err != nil {
|
if err := s.stdin.Close(); err != nil {
|
||||||
return fmt.Errorf("closing stdin: %v", err)
|
return fmt.Errorf("closing stdin: %w", err)
|
||||||
}
|
}
|
||||||
resChan := make(chan error, 1)
|
resChan := make(chan error, 1)
|
||||||
go func() {
|
go func() {
|
||||||
|
|
@ -205,7 +205,7 @@ func (c *isolatedIOConn) Write(ctx context.Context, msg jsonrpc.Message) error {
|
||||||
defer c.writeMu.Unlock()
|
defer c.writeMu.Unlock()
|
||||||
data, err := jsonrpc.EncodeMessage(msg)
|
data, err := jsonrpc.EncodeMessage(msg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("marshaling message: %v", err)
|
return fmt.Errorf("marshaling message: %w", err)
|
||||||
}
|
}
|
||||||
data = append(data, '\n')
|
data = append(data, '\n')
|
||||||
_, err = c.rwc.Write(data)
|
_, err = c.rwc.Write(data)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue