diff options
| author | Valery Piashchynski <[email protected]> | 2020-11-02 12:12:11 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-02 12:12:11 +0300 |
| commit | edc45b3e24afdb5e56e74ffbbbd50e0e3b04922b (patch) | |
| tree | c772690235392b8393117f2976b7aeb9210f3d49 | |
| parent | 0622706128f8d9ac381dee49aa4a74fe9b7904b5 (diff) | |
| parent | ba39499332aee7af9d237774a2b9e786a04f7736 (diff) | |
Merge pull request #380 from spiral/feature/switch_to_spiral_errors
Switch from Endure errors to the Spiral errors package
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | go.mod | 1 | ||||
| -rwxr-xr-x | go.sum | 2 | ||||
| -rw-r--r-- | plugins/app/app.go | 5 | ||||
| -rwxr-xr-x | plugins/rpc/rpc.go | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..128e2a5a --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +test: + go test -v -race -tags=debug . @@ -11,6 +11,7 @@ require ( github.com/shirou/gopsutil v2.20.9+incompatible github.com/spf13/viper v1.7.1 github.com/spiral/endure v1.0.0-beta10 + github.com/spiral/errors v1.0.0 github.com/spiral/goridge/v2 v2.4.5 github.com/stretchr/testify v1.6.1 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a @@ -197,6 +197,8 @@ github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spiral/endure v1.0.0-beta10 h1:eAFnJspvmMRDL3u7iwWK8eewogMhq4TTG3CjCBPnbeI= github.com/spiral/endure v1.0.0-beta10/go.mod h1:mXFf8zPqr1SJ1cG0Zf59f6X+MvJzrdIwVjzQpa107e0= +github.com/spiral/errors v1.0.0 h1:wdmJqAFY2Uf8KFK6b8Wkh6vxX++2+GwJWAUplrNTLD0= +github.com/spiral/errors v1.0.0/go.mod h1:SwMSZVdZkkJVgXNNafccqOaxWg0XPzVU/dEdUEInE0o= github.com/spiral/goridge/v2 v2.4.5 h1:rg4lLEJLrEh1Wj6G1qTsYVbYiQvig6mOR1F9GyDIGm8= github.com/spiral/goridge/v2 v2.4.5/go.mod h1:C/EZKFPON9lypi8QO7I5ObgVmrIzTmhZqFz/tmypcGc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/plugins/app/app.go b/plugins/app/app.go index 9301e38f..312e5bc6 100644 --- a/plugins/app/app.go +++ b/plugins/app/app.go @@ -3,12 +3,13 @@ package app import ( "context" "fmt" - "go.uber.org/zap" "os" "os/exec" "strings" - "github.com/spiral/endure/errors" + "go.uber.org/zap" + + "github.com/spiral/errors" "github.com/spiral/roadrunner/v2" "github.com/spiral/roadrunner/v2/plugins/config" "github.com/spiral/roadrunner/v2/util" diff --git a/plugins/rpc/rpc.go b/plugins/rpc/rpc.go index d272fc72..f299bd55 100755 --- a/plugins/rpc/rpc.go +++ b/plugins/rpc/rpc.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" "github.com/spiral/endure" - "github.com/spiral/endure/errors" + "github.com/spiral/errors" "github.com/spiral/goridge/v2" "github.com/spiral/roadrunner/v2/plugins/config" ) |