# HG changeset patch # User Tom Gottfried # Date 1565022079 -7200 # Node ID 91cb4a7b1b1302bcd73af424e2ac6fca45353ec1 # Parent a376351d27742c35ad8947e07751c85290b9029c Always try to translate to readable error if import failed diff -r a376351d2774 -r 91cb4a7b1b13 pkg/imports/queue.go --- 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) } diff -r a376351d2774 -r 91cb4a7b1b13 pkg/imports/sec.go --- 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 { diff -r a376351d2774 -r 91cb4a7b1b13 pkg/imports/st.go --- 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.