diff --git a/internal/server/logger.go b/internal/server/logger.go index 4e847aa3..873ba462 100644 --- a/internal/server/logger.go +++ b/internal/server/logger.go @@ -15,6 +15,7 @@ type infoWarner interface { type infoer interface { Info(s string) + Infof(format string, args ...any) } type warner interface { diff --git a/internal/server/middlewares/auth/configfile.go b/internal/server/middlewares/auth/configfile.go index 1722a910..b632dcfc 100644 --- a/internal/server/middlewares/auth/configfile.go +++ b/internal/server/middlewares/auth/configfile.go @@ -13,9 +13,6 @@ import ( func Read(filepath string) (settings Settings, err error) { file, err := os.Open(filepath) if err != nil { - if errors.Is(err, os.ErrNotExist) { - return Settings{}, nil - } return settings, fmt.Errorf("opening file: %w", err) } decoder := toml.NewDecoder(file) diff --git a/internal/server/server.go b/internal/server/server.go index 3f50717b..73b87c35 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -2,7 +2,9 @@ package server import ( "context" + "errors" "fmt" + "os" "github.com/qdm12/gluetun/internal/httpserver" "github.com/qdm12/gluetun/internal/models" @@ -17,8 +19,12 @@ func New(ctx context.Context, address string, logEnabled bool, logger Logger, server *httpserver.Server, err error, ) { authSettings, err := auth.Read(authConfigPath) - if err != nil { + switch { + case errors.Is(err, os.ErrNotExist): // no auth file present + case err != nil: return nil, fmt.Errorf("reading auth settings: %w", err) + default: + logger.Infof("read %d roles from authentication file", len(authSettings.Roles)) } authSettings.SetDefaults() err = authSettings.Validate()