diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-10-19 16:51:48 +0200 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-10-19 17:05:59 +0200 |
| commit | 7260aa0cd70195a4679ca3c94204d9e618f947f2 (patch) | |
| tree | 9321f5f3d21b06d1ab6dd50420879bc5ea41f044 /internal/util | |
| parent | f1a265190d8fd862bfff680fd0937a7f99759955 (diff) | |
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
Diffstat (limited to 'internal/util')
| -rw-r--r-- | internal/util/util.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/internal/util/util.go b/internal/util/util.go index a500e15..ef52ce2 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -15,10 +15,10 @@ import ( func EnsureValidURL(s string) (string, error) { parsedURL, parseErr := url.Parse(s) if parseErr != nil { - return "", &types.WrappedErrorMessage{ - Message: fmt.Sprintf("failed parsing url: %s", s), - Err: parseErr, - } + return "", types.NewWrappedError( + fmt.Sprintf("failed parsing url: %s", s), + parseErr, + ) } if parsedURL.Scheme == "" { @@ -44,7 +44,7 @@ func MakeRandomByteSlice(size int) ([]byte, error) { byteSlice := make([]byte, size) _, err := rand.Read(byteSlice) if err != nil { - return nil, &types.WrappedErrorMessage{Message: "failed reading random", Err: err} + return nil, types.NewWrappedError("failed reading random", err) } return byteSlice, nil } @@ -57,10 +57,10 @@ func EnsureDirectory(directory string) error { // Create with 700 permissions, read, write, execute only for the owner mkdirErr := os.MkdirAll(directory, 0o700) if mkdirErr != nil { - return &types.WrappedErrorMessage{ - Message: fmt.Sprintf("failed to create directory %s", directory), - Err: mkdirErr, - } + return types.NewWrappedError( + fmt.Sprintf("failed to create directory %s", directory), + mkdirErr, + ) } return nil } |
