comparison pkg/imports/queue.go @ 5101:1b0b13e70bc1 queued-stage-done

Proxy the original job creator directly and not only the dependencies.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 24 Mar 2020 16:47:49 +0100
parents d3a24152b0be
children 8cc5b08ffc2b
comparison
equal deleted inserted replaced
5100:d3a24152b0be 5101:1b0b13e70bc1
215 func (ue UnchangedError) Error() string { 215 func (ue UnchangedError) Error() string {
216 return string(ue) 216 return string(ue)
217 } 217 }
218 218
219 type reviewedJobCreator struct { 219 type reviewedJobCreator struct {
220 dependencies [2][]string 220 jobCreator JobCreator
221 } 221 }
222 222
223 func (*reviewedJobCreator) AutoAccept() bool { 223 func (*reviewedJobCreator) AutoAccept() bool {
224 return true 224 return true
225 } 225 }
226 226
227 func (r *reviewedJobCreator) Depends() [2][]string { 227 func (rjc *reviewedJobCreator) Depends() [2][]string {
228 return r.dependencies 228 return rjc.Depends()
229 } 229 }
230 230
231 func (*reviewedJobCreator) Description() string { 231 func (rjc *reviewedJobCreator) Description() string {
232 return "review job creator" 232 return rjc.Description() + "#reviewed"
233 } 233 }
234 234
235 func (*reviewedJobCreator) StageDone(context.Context, *sql.Tx, int64, Feedback) error { 235 func (*reviewedJobCreator) StageDone(context.Context, *sql.Tx, int64, Feedback) error {
236 return nil 236 return nil
237 } 237 }
320 320
321 func (q *importQueue) registerJobCreator(kind JobKind, jc JobCreator) { 321 func (q *importQueue) registerJobCreator(kind JobKind, jc JobCreator) {
322 q.creatorsMu.Lock() 322 q.creatorsMu.Lock()
323 defer q.creatorsMu.Unlock() 323 defer q.creatorsMu.Unlock()
324 q.creators[kind] = jc 324 q.creators[kind] = jc
325 q.creators[kind+"#review"] = &reviewedJobCreator{dependencies: jc.Depends()} 325 q.creators[kind+"#review"] = &reviewedJobCreator{jobCreator: jc}
326 326
327 } 327 }
328 328
329 // FindJobCreator looks up a JobCreator in the global import queue. 329 // FindJobCreator looks up a JobCreator in the global import queue.
330 func FindJobCreator(kind JobKind) JobCreator { 330 func FindJobCreator(kind JobKind) JobCreator {