mirror of
https://github.com/jc21/nginx-proxy-manager.git
synced 2024-08-30 18:22:48 +00:00
Use eris for error management
This commit is contained in:
@ -1,11 +1,10 @@
|
||||
package validator
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"npm/internal/entity/nginxtemplate"
|
||||
"npm/internal/entity/upstream"
|
||||
|
||||
"github.com/rotisserie/eris"
|
||||
)
|
||||
|
||||
// ValidateUpstream will check if associated objects exist and other checks
|
||||
@ -13,7 +12,7 @@ import (
|
||||
func ValidateUpstream(u upstream.Model) error {
|
||||
// Needs to have more than 1 server
|
||||
if len(u.Servers) < 2 {
|
||||
return errors.New("Upstreams require at least 2 servers")
|
||||
return eris.New("Upstreams require at least 2 servers")
|
||||
}
|
||||
|
||||
// Backup servers aren't permitted with hash balancing
|
||||
@ -21,7 +20,7 @@ func ValidateUpstream(u upstream.Model) error {
|
||||
// check all servers for a backup param
|
||||
for _, server := range u.Servers {
|
||||
if server.Backup {
|
||||
return errors.New("Backup servers cannot be used with hash balancing")
|
||||
return eris.New("Backup servers cannot be used with hash balancing")
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -29,10 +28,10 @@ func ValidateUpstream(u upstream.Model) error {
|
||||
// Check the nginx template exists and has the same type.
|
||||
nginxTemplate, err := nginxtemplate.GetByID(u.NginxTemplateID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Nginx Template #%d does not exist", u.NginxTemplateID)
|
||||
return eris.Errorf("Nginx Template #%d does not exist", u.NginxTemplateID)
|
||||
}
|
||||
if nginxTemplate.Type != "upstream" {
|
||||
return fmt.Errorf("Host Template #%d is not valid for this upstream", u.NginxTemplateID)
|
||||
return eris.Errorf("Host Template #%d is not valid for this upstream", u.NginxTemplateID)
|
||||
}
|
||||
|
||||
return nil
|
||||
|
Reference in New Issue
Block a user