ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-07-05 01:09:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use eris for error management

Browse Source
This commit is contained in:
Jamie Curnow
2023-02-24 17:19:07 +10:00
parent 80315bd50e
commit c288886fd4
44 changed files with 173 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/internal/entity/certificateauthority/methods.go
View File

@ -2,7 +2,6 @@ package certificateauthority
import (
"database/sql"
goerrors "errors"
"fmt"
"npm/internal/database"
@ -10,6 +9,8 @@ import (
"npm/internal/errors"
"npm/internal/logger"
"npm/internal/model"
"github.com/rotisserie/eris"
)
// GetByID finds a row by ID
@ -22,7 +23,7 @@ func GetByID(id int) (Model, error) {
// Create will create a row from this model
func Create(ca *Model) (int, error) {
if ca.ID != 0 {
return 0, goerrors.New("Cannot create certificate authority when model already has an ID")
return 0, eris.New("Cannot create certificate authority when model already has an ID")
}
ca.Touch(true)
@ -64,7 +65,7 @@ func Create(ca *Model) (int, error) {
// Update will Update a row from this model
func Update(ca *Model) error {
if ca.ID == 0 {
return goerrors.New("Cannot update certificate authority when model doesn't have an ID")
return eris.New("Cannot update certificate authority when model doesn't have an ID")
}
ca.Touch(false)

5
backend/internal/entity/certificateauthority/model.go
View File

@ -1,7 +1,6 @@
package certificateauthority
import (
goerrors "errors"
"fmt"
"os"
"path/filepath"
@ -10,6 +9,8 @@ import (
"npm/internal/database"
"npm/internal/errors"
"npm/internal/types"
"github.com/rotisserie/eris"
)
const (
@ -79,7 +80,7 @@ func (m *Model) Check() error {
var err error
if m.CABundle != "" {
if _, fileerr := os.Stat(filepath.Clean(m.CABundle)); goerrors.Is(fileerr, os.ErrNotExist) {
if _, fileerr := os.Stat(filepath.Clean(m.CABundle)); eris.Is(fileerr, os.ErrNotExist) {
err = errors.ErrCABundleDoesNotExist
}
}