Mercurial > gemma
changeset 4180:91cb4a7b1b13
Always try to translate to readable error if import failed
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 05 Aug 2019 18:21:19 +0200 |
| parents | a376351d2774 |
| children | bd97dc2dceea |
| files | pkg/imports/queue.go pkg/imports/sec.go pkg/imports/st.go |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/queue.go Mon Aug 05 18:14:41 2019 +0200 +++ b/pkg/imports/queue.go Mon Aug 05 18:21:19 2019 +0200 @@ -30,6 +30,7 @@ "gemma.intevation.de/gemma/pkg/auth" "gemma.intevation.de/gemma/pkg/common" "gemma.intevation.de/gemma/pkg/config" + "gemma.intevation.de/gemma/pkg/pgxutils" ) type ( @@ -675,7 +676,8 @@ feedback.Info("unchanged: %s", v.Error()) unchanged = true } else if errDo != nil { - feedback.Error("error in import: %v", errDo) + feedback.Error("error in import: %v", + pgxutils.ReadableError{Err: errDo}) retry = idj.nextRetry(feedback) }
--- a/pkg/imports/sec.go Mon Aug 05 18:14:41 2019 +0200 +++ b/pkg/imports/sec.go Mon Aug 05 18:21:19 2019 +0200 @@ -19,7 +19,6 @@ "time" "gemma.intevation.de/gemma/pkg/models" - "gemma.intevation.de/gemma/pkg/pgxutils" ) // Section is a Job to create a section in the database. @@ -182,7 +181,7 @@ sec.Source, sec.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.ReadableError{Err: err} + return nil, err } if err := track(ctx, tx, importID, "waterway.sections", id); err != nil {
--- a/pkg/imports/st.go Mon Aug 05 18:14:41 2019 +0200 +++ b/pkg/imports/st.go Mon Aug 05 18:21:19 2019 +0200 @@ -20,7 +20,6 @@ "time" "gemma.intevation.de/gemma/pkg/models" - "gemma.intevation.de/gemma/pkg/pgxutils" ) // Stretch is a Job to create a stretch in the database. @@ -205,7 +204,7 @@ st.Source, st.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.ReadableError{Err: err} + return nil, err } // store the associated countries.