Mercurial > gemma

comparison pkg/controllers/manualimports.go @ 1754:807569b08513

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1753:68bd990dd8e5 1754:807569b08513
33 retries = -1 33 retries = -1
34 } 34 }
35 return due, retries 35 return due, retries
36 } 36 }
37 37
38 func importBottleneck(input interface{}) (interface{}, time.Time, int, bool, bool) { 38 func importBottleneck(input interface{}) (interface{}, time.Time, int, bool) {
39 bi := input.(*models.BottleneckImport) 39 bi := input.(*models.BottleneckImport)
40 bn := &imports.Bottleneck{ 40 bn := &imports.Bottleneck{
41 URL: bi.URL, 41 URL: bi.URL,
42 Insecure: bi.Insecure, 42 Insecure: bi.Insecure,
43 } 43 }
44 due, retries := retry(bi.Attributes) 44 due, retries := retry(bi.Attributes)
45 return bn, due, retries, bi.SendEmail, false 45 return bn, due, retries, bi.SendEmail
46 } 46 }
47 47
48 func importGaugeMeasurement(input interface{}) (interface{}, time.Time, int, bool, bool) { 48 func importGaugeMeasurement(input interface{}) (interface{}, time.Time, int, bool) {
49 gi := input.(*models.GaugeMeasurementImport) 49 gi := input.(*models.GaugeMeasurementImport)
50 gm := &imports.GaugeMeasurement{ 50 gm := &imports.GaugeMeasurement{
51 URL: gi.URL, 51 URL: gi.URL,
52 Insecure: gi.Insecure, 52 Insecure: gi.Insecure,
53 } 53 }
54 due, retries := retry(gi.Attributes) 54 due, retries := retry(gi.Attributes)
55 return gm, due, retries, gi.SendEmail, true 55 return gm, due, retries, gi.SendEmail
56 } 56 }
57 57
58 func importFairwayAvailability(input interface{}) (interface{}, time.Time, int, bool, bool) { 58 func importFairwayAvailability(input interface{}) (interface{}, time.Time, int, bool) {
59 fai := input.(*models.FairwayAvailabilityImport) 59 fai := input.(*models.FairwayAvailabilityImport)
60 fa := &imports.FairwayAvailability{ 60 fa := &imports.FairwayAvailability{
61 URL: fai.URL, 61 URL: fai.URL,
62 Insecure: fai.Insecure, 62 Insecure: fai.Insecure,
63 } 63 }
64 due, retries := retry(fai.Attributes) 64 due, retries := retry(fai.Attributes)
65 return fa, due, retries, fai.SendEmail, true 65 return fa, due, retries, fai.SendEmail
66 } 66 }
67 67
68 func importWaterwayAxis(input interface{}) (interface{}, time.Time, int, bool, bool) { 68 func importWaterwayAxis(input interface{}) (interface{}, time.Time, int, bool) {
69 wxi := input.(*models.WaterwayAxisImport) 69 wxi := input.(*models.WaterwayAxisImport)
70 wx := &imports.WaterwayAxis{ 70 wx := &imports.WaterwayAxis{
71 URL: wxi.URL, 71 URL: wxi.URL,
72 FeatureType: wxi.FeatureType, 72 FeatureType: wxi.FeatureType,
73 SortBy: wxi.SortBy, 73 SortBy: wxi.SortBy,
74 } 74 }
75 due, retries := retry(wxi.Attributes) 75 due, retries := retry(wxi.Attributes)
76 return wx, due, retries, wxi.SendEmail, true 76 return wx, due, retries, wxi.SendEmail
77 } 77 }
78 78
79 func manualImport( 79 func manualImport(
80 kind imports.JobKind, 80 kind imports.JobKind,
81 setup func(interface{}) (interface{}, time.Time, int, bool, bool), 81 setup func(interface{}) (interface{}, time.Time, int, bool),
82 ) func(interface{}, *http.Request, *sql.Conn) (JSONResult, error) { 82 ) func(interface{}, *http.Request, *sql.Conn) (JSONResult, error) {
83 83
84 return func(input interface{}, req *http.Request, _ *sql.Conn) ( 84 return func(input interface{}, req *http.Request, _ *sql.Conn) (
85 jr JSONResult, err error) { 85 jr JSONResult, err error) {
86 86
87 what, due, retries, sendEmail, autoAccept := setup(input) 87 what, due, retries, sendEmail := setup(input)
88 88
89 var serialized string 89 var serialized string
90 if serialized, err = common.ToJSONString(what); err != nil { 90 if serialized, err = common.ToJSONString(what); err != nil {
91 return 91 return
92 } 92 }
96 var jobID int64 96 var jobID int64
97 if jobID, err = imports.AddJob( 97 if jobID, err = imports.AddJob(
98 kind, 98 kind,
99 due, retries, 99 due, retries,
100 session.User, 100 session.User,
101 sendEmail, autoAccept, 101 sendEmail,
102 serialized, 102 serialized,
103 ); err != nil { 103 ); err != nil {
104 return 104 return
105 } 105 }
106 106