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

check and log errors more often in deferred cleanup calls, and log remote-induced errors at lower priority

Browse Source 
We normally check errors for all operations. But for some cleanup calls, eg
"defer file.Close()", we didn't. Now we also check and log most of those.
Partially because those errors can point to some mishandling or unexpected code
paths (eg file unexpected already closed). And in part to make it easier to use
"errcheck" to find the real missing error checks, there is too much noise now.

The log.Check function can now be used unconditionally for checking and logging
about errors. It adjusts the log level if the error is caused by a network
connection being closed, or a context is canceled or its deadline reached, or a
socket deadline is reached.
This commit is contained in:
Mechiel Lukkien
2025-03-24 13:46:08 +01:00
parent 15a8ce8c0b
commit a2c79e25c1
38 changed files with 337 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
webapisrv/server.go
View File

@ -407,9 +407,7 @@ func (s server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
enc := json.NewEncoder(w)
enc.SetEscapeHTML(false)
werr := enc.Encode(err)
if werr != nil && !moxio.IsClosed(werr) {
log.Infox("writing error response", werr)
}
log.Check(werr, "writing error response")
}
// Called for all successful JSON responses, not non-JSON responses.
@ -421,9 +419,7 @@ func (s server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
enc := json.NewEncoder(w)
enc.SetEscapeHTML(false)
werr := enc.Encode(resp)
if werr != nil && !moxio.IsClosed(werr) {
log.Infox("writing error response", werr)
}
log.Check(werr, "writing error response")
}
la := loginAttempt(r, "webapi", "httpbasic")
@ -524,10 +520,12 @@ func (s server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
closeAccount()
log.Debug("webapi call result", slog.String("resultcode", "ok"))
metricResults.WithLabelValues(fn, "ok").Inc()
defer rc.Close()
if _, err := io.Copy(w, rc); err != nil && !moxio.IsClosed(err) {
log.Errorx("writing response to client", err)
}
defer func() {
err := rc.Close()
log.Check(err, "closing readcloser")
}()
_, err = io.Copy(w, rc)
log.Check(err, "writing response to client")
}
// loginAttempt initializes a store.LoginAttempt, for adding to the store after
@ -955,7 +953,8 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
}
}
if alternative != nil {
alternative.Close()
err := alternative.Close()
xcheckf(err, "closing alternative part")
alternative = nil
}
@ -967,7 +966,8 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
}
}
if related != nil {
related.Close()
err := related.Close()
xcheckf(err, "closing related part")
related = nil
}
cur = mixed
@ -978,7 +978,8 @@ func (s server) Send(ctx context.Context, req webapi.SendRequest) (resp webapi.S
}
}
if mixed != nil {
mixed.Close()
err := mixed.Close()
xcheckf(err, "closing mixed part")
mixed = nil
}
cur = nil
@ -1222,7 +1223,8 @@ func (s server) MessageGet(ctx context.Context, req webapi.MessageGetRequest) (r
})
defer func() {
if err != nil {
msgr.Close()
err := msgr.Close()
log.Check(err, "cleaning up message reader")
}
}()
@ -1327,6 +1329,7 @@ func (s server) MessageRawGet(ctx context.Context, req webapi.MessageRawGetReque
func (s server) MessagePartGet(ctx context.Context, req webapi.MessagePartGetRequest) (resp io.ReadCloser, err error) {
reqInfo := ctx.Value(requestInfoCtxKey).(requestInfo)
log := reqInfo.Log
acc := reqInfo.Account
var m store.Message
@ -1337,7 +1340,8 @@ func (s server) MessagePartGet(ctx context.Context, req webapi.MessagePartGetReq
})
defer func() {
if err != nil {
msgr.Close()
err := msgr.Close()
log.Check(err, "cleaning up message reader")
}
}()