From 7260aa0cd70195a4679ca3c94204d9e618f947f2 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Wed, 19 Oct 2022 16:51:48 +0200 Subject: Refactor: Make errors use the parent's error level - All wrapped errors have to be created with types.NewWrappedError to inherit the error level from the parent - Or types.NewWrappedErrorLevel can be used which means a custom error level is given. For example this is done with cancelling OAuth - Client public errors are forwarded with handleError that also logs it with the error's level --- internal/server/custom.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/server/custom.go') diff --git a/internal/server/custom.go b/internal/server/custom.go index feda1f3..6ba6503 100644 --- a/internal/server/custom.go +++ b/internal/server/custom.go @@ -11,18 +11,18 @@ func (servers *Servers) SetCustomServer(server Server) error { errorMessage := "failed setting custom server" base, baseErr := server.GetBase() if baseErr != nil { - return &types.WrappedErrorMessage{Message: errorMessage, Err: baseErr} + return types.NewWrappedError(errorMessage, baseErr) } if base.Type != "custom_server" { - return &types.WrappedErrorMessage{Message: errorMessage, Err: errors.New("Not a custom server")} + return types.NewWrappedError(errorMessage, errors.New("Not a custom server")) } if _, ok := servers.CustomServers.Map[base.URL]; ok { servers.CustomServers.CurrentURL = base.URL servers.IsType = CustomServerType } else { - return &types.WrappedErrorMessage{Message: errorMessage, Err: errors.New("Not a custom server")} + return types.NewWrappedError(errorMessage, errors.New("Not a custom server")) } return nil } @@ -31,7 +31,7 @@ func (servers *Servers) GetCustomServer(url string) (*InstituteAccessServer, err if server, ok := servers.CustomServers.Map[url]; ok { return server, nil } - return nil, &types.WrappedErrorMessage{Message: "failed to get institute access server", Err: fmt.Errorf("No custom server with URL: %s", url)} + return nil, types.NewWrappedError("failed to get institute access server", fmt.Errorf("No custom server with URL: %s", url)) } func (servers *Servers) RemoveCustomServer(url string) { -- cgit v1.2.3