Mercurial > gemma
diff pkg/controllers/manualimports.go @ 1754:807569b08513
Import queue: Auto acceptance is now a property of the import kind itself and is not configurable any more.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 10 Jan 2019 16:19:26 +0100 |
parents | 49e047c2106e |
children | 614c6c766691 |
line wrap: on
line diff
--- a/pkg/controllers/manualimports.go Thu Jan 10 15:55:08 2019 +0100 +++ b/pkg/controllers/manualimports.go Thu Jan 10 16:19:26 2019 +0100 @@ -35,37 +35,37 @@ return due, retries } -func importBottleneck(input interface{}) (interface{}, time.Time, int, bool, bool) { +func importBottleneck(input interface{}) (interface{}, time.Time, int, bool) { bi := input.(*models.BottleneckImport) bn := &imports.Bottleneck{ URL: bi.URL, Insecure: bi.Insecure, } due, retries := retry(bi.Attributes) - return bn, due, retries, bi.SendEmail, false + return bn, due, retries, bi.SendEmail } -func importGaugeMeasurement(input interface{}) (interface{}, time.Time, int, bool, bool) { +func importGaugeMeasurement(input interface{}) (interface{}, time.Time, int, bool) { gi := input.(*models.GaugeMeasurementImport) gm := &imports.GaugeMeasurement{ URL: gi.URL, Insecure: gi.Insecure, } due, retries := retry(gi.Attributes) - return gm, due, retries, gi.SendEmail, true + return gm, due, retries, gi.SendEmail } -func importFairwayAvailability(input interface{}) (interface{}, time.Time, int, bool, bool) { +func importFairwayAvailability(input interface{}) (interface{}, time.Time, int, bool) { fai := input.(*models.FairwayAvailabilityImport) fa := &imports.FairwayAvailability{ URL: fai.URL, Insecure: fai.Insecure, } due, retries := retry(fai.Attributes) - return fa, due, retries, fai.SendEmail, true + return fa, due, retries, fai.SendEmail } -func importWaterwayAxis(input interface{}) (interface{}, time.Time, int, bool, bool) { +func importWaterwayAxis(input interface{}) (interface{}, time.Time, int, bool) { wxi := input.(*models.WaterwayAxisImport) wx := &imports.WaterwayAxis{ URL: wxi.URL, @@ -73,18 +73,18 @@ SortBy: wxi.SortBy, } due, retries := retry(wxi.Attributes) - return wx, due, retries, wxi.SendEmail, true + return wx, due, retries, wxi.SendEmail } func manualImport( kind imports.JobKind, - setup func(interface{}) (interface{}, time.Time, int, bool, bool), + setup func(interface{}) (interface{}, time.Time, int, bool), ) func(interface{}, *http.Request, *sql.Conn) (JSONResult, error) { return func(input interface{}, req *http.Request, _ *sql.Conn) ( jr JSONResult, err error) { - what, due, retries, sendEmail, autoAccept := setup(input) + what, due, retries, sendEmail := setup(input) var serialized string if serialized, err = common.ToJSONString(what); err != nil { @@ -98,7 +98,7 @@ kind, due, retries, session.User, - sendEmail, autoAccept, + sendEmail, serialized, ); err != nil { return