comparison pkg/imports/queue.go @ 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 350a24c92848
children 47922c1a088d
comparison
equal deleted inserted replaced
4179:a376351d2774 4180:91cb4a7b1b13
28 "github.com/jackc/pgx/pgtype" 28 "github.com/jackc/pgx/pgtype"
29 29
30 "gemma.intevation.de/gemma/pkg/auth" 30 "gemma.intevation.de/gemma/pkg/auth"
31 "gemma.intevation.de/gemma/pkg/common" 31 "gemma.intevation.de/gemma/pkg/common"
32 "gemma.intevation.de/gemma/pkg/config" 32 "gemma.intevation.de/gemma/pkg/config"
33 "gemma.intevation.de/gemma/pkg/pgxutils"
33 ) 34 )
34 35
35 type ( 36 type (
36 // Feedback is passed to the Do method of a Job to log 37 // Feedback is passed to the Do method of a Job to log
37 // informations, warnings or errors. 38 // informations, warnings or errors.
673 var unchanged, retry bool 674 var unchanged, retry bool
674 if v, ok := errDo.(UnchangedError); ok { 675 if v, ok := errDo.(UnchangedError); ok {
675 feedback.Info("unchanged: %s", v.Error()) 676 feedback.Info("unchanged: %s", v.Error())
676 unchanged = true 677 unchanged = true
677 } else if errDo != nil { 678 } else if errDo != nil {
678 feedback.Error("error in import: %v", errDo) 679 feedback.Error("error in import: %v",
680 pgxutils.ReadableError{Err: errDo})
679 retry = idj.nextRetry(feedback) 681 retry = idj.nextRetry(feedback)
680 } 682 }
681 683
682 var errCleanup error 684 var errCleanup error
683 if !retry { // cleanup debris 685 if !retry { // cleanup debris