serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-26 00:13:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

better error message if import fails, only stack traces for unexpected panics (i.e. not the special sential panic value)

Browse source
This commit is contained in:
Mechiel Lukkien 2023-02-26 22:25:57 +01:00
parent 9b3a170cc2
commit eda907fc86
No known key found for this signature in database
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
import.go
View file

@ -199,9 +199,13 @@ func importctl(ctl *ctl, mbox bool) {
return
}
ctl.log.Error("store error", mlog.Field("panic", x))
debug.PrintStack()
metrics.PanicInc("import")
if x != ctl.x {
ctl.log.Error("import error", mlog.Field("panic", fmt.Errorf("%v", x)))
debug.PrintStack()
metrics.PanicInc("import")
} else {
ctl.log.Error("import error")
}
for _, id := range deliveredIDs {
p := a.MessagePath(id)
@ -209,7 +213,7 @@ func importctl(ctl *ctl, mbox bool) {
ctl.log.Check(err, "closing message file after import error", mlog.Field("path", p))
}
ctl.xerror(fmt.Sprintf("%v", x))
ctl.xerror(fmt.Sprintf("import error: %v", x))
}()
var changes []store.Change