Mercurial > gemma
changeset 5734:ea16ae748357
Merged
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Wed, 29 May 2024 12:55:50 +0200 |
parents | 87b6dcfbab34 (current diff) 4c8652a61eab (diff) |
children | 8cbe0a873e32 |
files | |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/queue.go Tue May 28 18:25:45 2024 +0200 +++ b/pkg/imports/queue.go Wed May 29 12:55:50 2024 +0200 @@ -420,6 +420,11 @@ return names } +// String implements [fmt/Stringer]. +func (idj *idJob) String() string { + return fmt.Sprintf("job %s [%d]", idj.kind, idj.id) +} + func (idj *idJob) nextRetry(feedback Feedback) bool { switch { case idj.waitRetry.Status != pgtype.Present && !idj.triesLeft.Valid: @@ -1036,7 +1041,8 @@ feedback.Info("unchanged: %s", v.Error()) unchanged = true } else if errDo != nil { - feedback.Error("error in import: %v", + feedback.Error("error in import: %v %v", + idj, pgxutils.ReadableError{Err: errDo}) retry = idj.nextRetry(feedback) } @@ -1044,7 +1050,7 @@ var errCleanup error if !retry { // cleanup debris if errCleanup = survive(job.CleanUp)(); errCleanup != nil { - feedback.Error("error cleanup: %v", errCleanup) + feedback.Error("error cleanup: %v %v", idj, errCleanup) } }