Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize: uniform error creation #668

Merged
merged 9 commits into from
May 19, 2023
Merged

optimize: uniform error creation #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dab1e09
optimize: uniform error creation
justlorain Mar 14, 2023
82986f9
add nolint
justlorain Mar 14, 2023
c64daf2
change errnotallowed and errduplicated to public
justlorain Mar 14, 2023
61e1049
rollback bytesconv errors
justlorain Mar 14, 2023
df68c59
Merge branch 'develop' into optimize_err_format
justlorain May 15, 2023
f18a8bf
resolve conflict
justlorain May 15, 2023
7d8b811
Merge branch 'cloudwego:develop' into optimize_err_format
justlorain May 15, 2023
4d5b0a8
remove sleep
justlorain May 15, 2023
c6da5c4
Merge branch 'develop' into optimize_err_format
li-jin-gou May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/app/server/hertz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ package server

import (
"context"
"errors"
"os"
"os/signal"
"syscall"
"time"

"github.com/cloudwego/hertz/pkg/app/middlewares/server/recovery"
"github.com/cloudwego/hertz/pkg/common/config"
"github.com/cloudwego/hertz/pkg/common/errors"
"github.com/cloudwego/hertz/pkg/common/hlog"
"github.com/cloudwego/hertz/pkg/route"
)
Expand Down Expand Up @@ -108,7 +108,7 @@ func waitSignal(errCh chan error) error {
switch sig {
case syscall.SIGTERM:
// force exit
return errors.New(sig.String()) // nolint
return errors.NewPublic(sig.String()) // nolint
case syscall.SIGHUP, syscall.SIGINT:
hlog.SystemLogger().Infof("Received signal: %s\n", sig)
// graceful shutdown
Expand Down
4 changes: 2 additions & 2 deletions pkg/common/stackless/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
package stackless

import (
"errors"
"fmt"
"io"

"github.com/cloudwego/hertz/pkg/common/bytebufferpool"
"github.com/cloudwego/hertz/pkg/common/errors"
)

// Writer is an interface stackless writer must conform to.
Expand Down Expand Up @@ -137,7 +137,7 @@ func (w *writer) do(op op) error {
return err
}

var errHighLoad = errors.New("cannot compress data due to high load")
var errHighLoad = errors.NewPublic("cannot compress data due to high load")

var stacklessWriterFunc = NewFunc(writerFunc)

Expand Down
5 changes: 2 additions & 3 deletions pkg/common/test/mock/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package mock

import (
"bytes"
"errors"
"net"
"strings"
"time"
Expand Down Expand Up @@ -258,15 +257,15 @@ func (m *StreamConn) Peek(n int) ([]byte, error) {
m.Data = m.Data[:cap(m.Data)]
return m.Data[:1], nil
}
return nil, errors.New("not enough data")
return nil, errs.NewPublic("not enough data")
}

func (m *StreamConn) Skip(n int) error {
if len(m.Data) >= n {
m.Data = m.Data[n:]
return nil
}
return errors.New("not enough data")
return errs.NewPublic("not enough data")
}

func (m *StreamConn) Release() error {
Expand Down
7 changes: 4 additions & 3 deletions pkg/common/tracer/stats/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package stats

import (
"errors"
"sync"
"sync/atomic"

"github.com/cloudwego/hertz/pkg/common/errors"
)

// EventIndex indicates a unique event.
Expand Down Expand Up @@ -88,8 +89,8 @@ var (

// errors
var (
ErrNotAllowed = errors.New("event definition is not allowed after initialization")
ErrDuplicated = errors.New("event name is already defined")
ErrNotAllowed = errors.NewPublic("event definition is not allowed after initialization")
ErrDuplicated = errors.NewPublic("event name is already defined")
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/protocol/http1/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"context"
"crypto/tls"
"encoding/base64"
"errors"
"time"

"github.com/cloudwego/hertz/internal/bytesconv"
"github.com/cloudwego/hertz/internal/bytestr"
"github.com/cloudwego/hertz/pkg/common/errors"
"github.com/cloudwego/hertz/pkg/network"
"github.com/cloudwego/hertz/pkg/protocol"
"github.com/cloudwego/hertz/pkg/protocol/consts"
Expand Down Expand Up @@ -111,7 +111,7 @@ func SetupProxy(conn network.Conn, addr string, proxyURI *protocol.URI, tlsConfi
if connectResp.StatusCode() != consts.StatusOK {
conn.Close()

return nil, errors.New(consts.StatusMessage(connectResp.StatusCode()))
return nil, errors.NewPublic(consts.StatusMessage(connectResp.StatusCode()))
}
}

Expand Down