infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 16:24:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

in account & admin web api's, differentiate between server errors and user errors, and add a prometheus monitoring rule for server errors

Browse Source
This commit is contained in:
Mechiel Lukkien
2023-08-09 08:02:58 +02:00
parent 8c3c12d96a
commit f5af258075
3 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webaccount/account.go
View File

@ -77,6 +77,16 @@ func xcheckf(ctx context.Context, err error, format string, args ...any) {
panic(&sherpa.Error{Code: "server:error", Message: errmsg})
}
func xcheckuserf(ctx context.Context, err error, format string, args ...any) {
if err == nil {
return
}
msg := fmt.Sprintf(format, args...)
errmsg := fmt.Sprintf("%s: %s", msg, err)
xlog.WithContext(ctx).Errorx(msg, err)
panic(&sherpa.Error{Code: "user:error", Message: errmsg})
}
// Account exports web API functions for the account web interface. All its
// methods are exported under api/. Function calls require valid HTTP
// Authentication credentials of a user.
@ -378,11 +388,11 @@ func (Account) DestinationSave(ctx context.Context, destName string, oldDest, ne
}
curDest, ok := accConf.Destinations[destName]
if !ok {
xcheckf(ctx, errors.New("not found"), "looking up destination")
xcheckuserf(ctx, errors.New("not found"), "looking up destination")
}
if !curDest.Equal(oldDest) {
xcheckf(ctx, errors.New("modified"), "checking stored destination")
xcheckuserf(ctx, errors.New("modified"), "checking stored destination")
}
// Keep fields we manage.