ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-06-18 18:16:26 +00:00
Code Issues Actions 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

6
backend/internal/acme/acmesh.go
View File

@ -13,12 +13,14 @@ import (
"npm/internal/entity/certificateauthority"
"npm/internal/entity/dnsprovider"
"npm/internal/logger"
"github.com/rotisserie/eris"
)
func getAcmeShFilePath() (string, error) {
path, err := exec.LookPath("acme.sh")
if err != nil {
return path, fmt.Errorf("Cannot find acme.sh execuatable script in PATH")
return path, eris.Wrapf(err, "Cannot find acme.sh execuatable script in PATH")
}
return path, nil
}
@ -107,7 +109,7 @@ func shExec(args []string, envs []string) (string, error) {
b, e := c.CombinedOutput()
if e != nil {
// logger.Error("AcmeShError", fmt.Errorf("Command error: %s -- %v\n%+v", acmeSh, args, e))
// logger.Error("AcmeShError", eris.Wrapf(e, "Command error: %s -- %v\n%+v", acmeSh, args, e))
logger.Warn(string(b))
}

10
backend/internal/acme/errors.go
View File

@ -1,10 +1,12 @@
package acme
import "errors"
import (
"github.com/rotisserie/eris"
)
// All errors relating to Acme.sh use
var (
ErrDNSNeedsDNSProvider = errors.New("RequestCert dns method requires a dns provider")
ErrHTTPHasDNSProvider = errors.New("RequestCert http method does not need a dns provider")
ErrMethodNotSupported = errors.New("RequestCert method not supported")
ErrDNSNeedsDNSProvider = eris.New("RequestCert dns method requires a dns provider")
ErrHTTPHasDNSProvider = eris.New("RequestCert http method does not need a dns provider")
ErrMethodNotSupported = eris.New("RequestCert method not supported")
)