Mercurial > gemma
comparison pkg/controllers/agmimports.go @ 2074:515bdc765565
Approved gauge measurement import: Removed senseless parameters.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 30 Jan 2019 17:25:59 +0100 |
parents | 8eeb0b5eb340 |
children | 4d6979dedb11 |
comparison
equal
deleted
inserted
replaced
2073:e6dccc7a3ea1 | 2074:515bdc765565 |
---|---|
19 "io/ioutil" | 19 "io/ioutil" |
20 "log" | 20 "log" |
21 "net/http" | 21 "net/http" |
22 "os" | 22 "os" |
23 "path/filepath" | 23 "path/filepath" |
24 "strconv" | |
25 "time" | 24 "time" |
26 | 25 |
27 "gemma.intevation.de/gemma/pkg/auth" | 26 "gemma.intevation.de/gemma/pkg/auth" |
28 "gemma.intevation.de/gemma/pkg/common" | 27 "gemma.intevation.de/gemma/pkg/common" |
29 "gemma.intevation.de/gemma/pkg/config" | 28 "gemma.intevation.de/gemma/pkg/config" |
92 | 91 |
93 session, _ := auth.GetSession(req) | 92 session, _ := auth.GetSession(req) |
94 | 93 |
95 sendEmail := req.FormValue("email") != "" | 94 sendEmail := req.FormValue("email") != "" |
96 | 95 |
97 var due time.Time | |
98 if d := req.FormValue("due"); d != "" { | |
99 var err error | |
100 if due, err = time.Parse("2006-01-02T15:04:05", d); err != nil { | |
101 log.Printf("error: %v\n", err) | |
102 } | |
103 } | |
104 | |
105 var retries *int | |
106 if r := req.FormValue("retries"); r != "" { | |
107 if v, err := strconv.Atoi(r); err != nil { | |
108 log.Printf("error: %v\n", err) | |
109 } else { | |
110 retries = &v | |
111 } | |
112 } | |
113 | |
114 var waitDuration *time.Duration | |
115 if wd := req.FormValue("wait-duration"); wd != "" { | |
116 if v, err := time.ParseDuration(wd); err != nil { | |
117 log.Printf("error: %v\n", err) | |
118 } else { | |
119 waitDuration = &v | |
120 } | |
121 } | |
122 | |
123 jobID, err := imports.AddJob( | 96 jobID, err := imports.AddJob( |
124 imports.AGMJobKind, | 97 imports.AGMJobKind, |
125 due, | 98 time.Time{}, // due |
126 retries, | 99 nil, // trys |
127 waitDuration, | 100 nil, // retry wait |
128 session.User, | 101 session.User, |
129 sendEmail, | 102 sendEmail, |
130 serialized) | 103 serialized) |
131 | 104 |
132 if err != nil { | 105 if err != nil { |