Mercurial > gemma
changeset 4147:c489c78ed525
Made 'go vet' happy with imports again.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 02 Aug 2019 11:41:12 +0200 |
parents | f464cbcdf2f2 |
children | 1b1218bbd414 |
files | pkg/imports/bn.go pkg/imports/fd.go pkg/imports/gm.go pkg/imports/sec.go pkg/imports/st.go pkg/imports/wa.go pkg/imports/wg.go pkg/imports/wx.go |
diffstat | 8 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/bn.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/bn.go Fri Aug 02 11:41:12 2019 +0200 @@ -568,7 +568,7 @@ } return nil }); err != nil { - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) return nil }
--- a/pkg/imports/fd.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/fd.go Fri Aug 02 11:41:12 2019 +0200 @@ -311,7 +311,7 @@ // ignore -> filtered by responsibility_areas continue features case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) continue features } // Store for potential later removal.
--- a/pkg/imports/gm.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/gm.go Fri Aug 02 11:41:12 2019 +0200 @@ -162,8 +162,8 @@ mt := nts.Message_type_typeWRM var dis []*nts.Date_pair dis = append(dis, &nts.Date_pair{ - Date_start: nts.Date{time.Now().Add(time.Duration(-24) * time.Hour)}, - Date_end: nts.Date{time.Now()}, + Date_start: nts.Date{Time: time.Now().Add(time.Duration(-24) * time.Hour)}, + Date_end: nts.Date{Time: time.Now()}, }) req := &nts.Get_messages_query{ @@ -443,7 +443,7 @@ case err == sql.ErrNoRows: // thats expected, nothing to do case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) default: newP++ } @@ -474,7 +474,7 @@ case err == sql.ErrNoRows: // thats expected, nothing to do case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) default: newM++ }
--- a/pkg/imports/sec.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/sec.go Fri Aug 02 11:41:12 2019 +0200 @@ -182,7 +182,7 @@ sec.Source, sec.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.ReadableError{err} + return nil, pgxutils.ReadableError{Err: err} } if err := track(ctx, tx, importID, "waterway.sections", id); err != nil {
--- a/pkg/imports/st.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/st.go Fri Aug 02 11:41:12 2019 +0200 @@ -203,7 +203,7 @@ st.Source, st.Tolerance, ).Scan(&id); err != nil { - return nil, pgxutils.ReadableError{err} + return nil, pgxutils.ReadableError{Err: err} } // store the associated countries.
--- a/pkg/imports/wa.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/wa.go Fri Aug 02 11:41:12 2019 +0200 @@ -247,7 +247,7 @@ outside++ // ignore -> filtered by responsibility_areas case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) default: features++ }
--- a/pkg/imports/wg.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/wg.go Fri Aug 02 11:41:12 2019 +0200 @@ -327,7 +327,7 @@ ).Scan(&isNew) switch { case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -352,7 +352,7 @@ source, time.Time(*dr.Lastupdate), ); err != nil { - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -389,7 +389,7 @@ unchanged++ continue case err2 != nil: - feedback.Warn(pgxutils.ReadableError{err2}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err2}.Error()) if err3 := tx.Rollback(); err3 != nil { return nil, err3 } @@ -436,7 +436,7 @@ code.String(), &validity, ); err != nil { - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) if err2 := tx.Rollback(); err2 != nil { return nil, err2 } @@ -484,7 +484,7 @@ string(**wl.level), int64(**wl.value), ); err != nil { - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) tx.Rollback() continue }
--- a/pkg/imports/wx.go Fri Aug 02 11:34:16 2019 +0200 +++ b/pkg/imports/wx.go Fri Aug 02 11:41:12 2019 +0200 @@ -321,7 +321,7 @@ // ignore -> filtered by responsibility_areas return nil case err != nil: - feedback.Warn(pgxutils.ReadableError{err}.Error()) + feedback.Warn(pgxutils.ReadableError{Err: err}.Error()) default: *features++ }