mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request: AG-33410-aghos-err
Merge in DNS/adguard-home from AG-33410-aghos-err to master Squashed commit of the following: commit6014ea1e91
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jun 14 08:30:30 2024 +0300 all: imp code commit232b207d8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Jun 13 12:18:41 2024 +0300 all: rm aghos unsupported err
This commit is contained in:
parent
bed86d57f3
commit
8432593be1
@ -19,25 +19,9 @@ import (
|
|||||||
"github.com/AdguardTeam/golibs/log"
|
"github.com/AdguardTeam/golibs/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// UnsupportedError is returned by functions and methods when a particular
|
// Unsupported is a helper that returns a wrapped [errors.ErrUnsupported].
|
||||||
// operation Op cannot be performed on the current OS.
|
|
||||||
type UnsupportedError struct {
|
|
||||||
Op string
|
|
||||||
OS string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error implements the error interface for *UnsupportedError.
|
|
||||||
func (err *UnsupportedError) Error() (msg string) {
|
|
||||||
return fmt.Sprintf("%s is unsupported on %s", err.Op, err.OS)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unsupported is a helper that returns an *UnsupportedError with the Op field
|
|
||||||
// set to op and the OS field set to the current OS.
|
|
||||||
func Unsupported(op string) (err error) {
|
func Unsupported(op string) (err error) {
|
||||||
return &UnsupportedError{
|
return fmt.Errorf("%s: not supported on %s: %w", op, runtime.GOOS, errors.ErrUnsupported)
|
||||||
Op: op,
|
|
||||||
OS: runtime.GOOS,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetRlimit sets user-specified limit of how many fd's we can use.
|
// SetRlimit sets user-specified limit of how many fd's we can use.
|
||||||
|
@ -6,7 +6,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/AdguardTeam/AdGuardHome/internal/aghos"
|
|
||||||
"github.com/AdguardTeam/AdGuardHome/internal/ipset"
|
"github.com/AdguardTeam/AdGuardHome/internal/ipset"
|
||||||
"github.com/AdguardTeam/golibs/errors"
|
"github.com/AdguardTeam/golibs/errors"
|
||||||
"github.com/AdguardTeam/golibs/log"
|
"github.com/AdguardTeam/golibs/log"
|
||||||
@ -35,7 +34,7 @@ func (c *ipsetCtx) init(ipsetConf []string) (err error) {
|
|||||||
log.Info("ipset: warning: cannot initialize: %s", err)
|
log.Info("ipset: warning: cannot initialize: %s", err)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
} else if unsupErr := (&aghos.UnsupportedError{}); errors.As(err, &unsupErr) {
|
} else if errors.Is(err, errors.ErrUnsupported) {
|
||||||
log.Info("ipset: warning: %s", err)
|
log.Info("ipset: warning: %s", err)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -178,7 +178,7 @@ func setupContext(opts options) (err error) {
|
|||||||
// unsupported errors and returns nil. If err is nil, logIfUnsupported returns
|
// unsupported errors and returns nil. If err is nil, logIfUnsupported returns
|
||||||
// nil. Otherwise, it returns err.
|
// nil. Otherwise, it returns err.
|
||||||
func logIfUnsupported(msg string, err error) (outErr error) {
|
func logIfUnsupported(msg string, err error) (outErr error) {
|
||||||
if errors.As(err, new(*aghos.UnsupportedError)) {
|
if errors.Is(err, errors.ErrUnsupported) {
|
||||||
log.Debug(msg, err)
|
log.Debug(msg, err)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -22,8 +22,8 @@ type Manager interface {
|
|||||||
//
|
//
|
||||||
// DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
|
// DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME]...
|
||||||
//
|
//
|
||||||
// If ipsetConf is empty, msg and err are nil. The error is of type
|
// If ipsetConf is empty, msg and err are nil. The error's chain contains
|
||||||
// *aghos.UnsupportedError if the OS is not supported.
|
// [errors.ErrUnsupported] if current OS is not supported.
|
||||||
func NewManager(ipsetConf []string) (mgr Manager, err error) {
|
func NewManager(ipsetConf []string) (mgr Manager, err error) {
|
||||||
if len(ipsetConf) == 0 {
|
if len(ipsetConf) == 0 {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
Loading…
Reference in New Issue
Block a user