Mercurial > gemma

changeset 4197:5d7ce7f926eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Log fatal errors as errors, not warnings, in imports
author Tom Gottfried <tom@intevation.de>
date Wed, 14 Aug 2019 17:12:23 +0200
parents 948e312e87bc
children b0bb1b624678 49564382ffff
files pkg/imports/bn.go pkg/imports/fd.go pkg/imports/gm.go pkg/imports/wa.go pkg/imports/wg.go pkg/imports/wx.go
diffstat 6 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/bn.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/bn.go	Wed Aug 14 17:12:23 2019 +0200
@@ -397,7 +397,7 @@
 		if t, ok := fromTo[fromKey]; ok {
 			tfrom.Set(t)
 		} else {
-			feedback.Warn("Missing start date")
+			feedback.Error("Missing start date")
 			return nil
 		}
 
@@ -568,7 +568,7 @@
 		}
 		return nil
 	}); err != nil {
-		feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+		feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 		return nil
 	}
 
--- a/pkg/imports/fd.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/fd.go	Wed Aug 14 17:12:23 2019 +0200
@@ -311,7 +311,7 @@
 					// ignore -> filtered by responsibility_areas
 					continue features
 				case err != nil:
-					feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+					feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 					continue features
 				}
 				// Store for potential later removal.
--- a/pkg/imports/gm.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/gm.go	Wed Aug 14 17:12:23 2019 +0200
@@ -444,7 +444,7 @@
 					case err == sql.ErrNoRows:
 						// thats expected, nothing to do
 					case err != nil:
-						feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+						feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 					default:
 						newP++
 					}
@@ -475,7 +475,7 @@
 					case err == sql.ErrNoRows:
 						// thats expected, nothing to do
 					case err != nil:
-						feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+						feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 					default:
 						newM++
 					}
--- a/pkg/imports/wa.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/wa.go	Wed Aug 14 17:12:23 2019 +0200
@@ -247,7 +247,7 @@
 					outside++
 					// ignore -> filtered by responsibility_areas
 				case err != nil:
-					feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+					feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 				default:
 					features++
 				}
--- a/pkg/imports/wg.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/wg.go	Wed Aug 14 17:12:23 2019 +0200
@@ -329,7 +329,7 @@
 			).Scan(&isNew)
 			switch {
 			case err != nil:
-				feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+				feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 				if err2 := tx.Rollback(); err2 != nil {
 					return nil, err2
 				}
@@ -354,7 +354,7 @@
 					source,
 					time.Time(*dr.Lastupdate),
 				); err != nil {
-					feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+					feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 					if err2 := tx.Rollback(); err2 != nil {
 						return nil, err2
 					}
@@ -391,7 +391,7 @@
 					unchanged++
 					continue
 				case err2 != nil:
-					feedback.Warn(pgxutils.ReadableError{Err: err2}.Error())
+					feedback.Error(pgxutils.ReadableError{Err: err2}.Error())
 					if err3 := tx.Rollback(); err3 != nil {
 						return nil, err3
 					}
@@ -438,7 +438,7 @@
 				code.String(),
 				&validity,
 			); err != nil {
-				feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+				feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 				if err2 := tx.Rollback(); err2 != nil {
 					return nil, err2
 				}
@@ -486,7 +486,7 @@
 					string(**wl.level),
 					int64(**wl.value),
 				); err != nil {
-					feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+					feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 					tx.Rollback()
 					continue
 				}
--- a/pkg/imports/wx.go	Wed Aug 14 16:55:46 2019 +0200
+++ b/pkg/imports/wx.go	Wed Aug 14 17:12:23 2019 +0200
@@ -321,7 +321,7 @@
 		// ignore -> filtered by responsibility_areas
 		return nil
 	case err != nil:
-		feedback.Warn(pgxutils.ReadableError{Err: err}.Error())
+		feedback.Error(pgxutils.ReadableError{Err: err}.Error())
 	default:
 		*features++
 	}