Mercurial > gemma
changeset 2168:b868cb653c4d
Import queue: The job kind parameter when creating a new job from a string was never used.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 08 Feb 2019 15:39:17 +0100 |
parents | 40f26fbc505f |
children | f6380bbdb853 |
files | pkg/imports/agm.go pkg/imports/bn.go pkg/imports/dma.go pkg/imports/dmv.go pkg/imports/fa.go pkg/imports/fd.go pkg/imports/gm.go pkg/imports/queue.go pkg/imports/sr.go pkg/imports/st.go pkg/imports/wa.go pkg/imports/wg.go pkg/imports/wp.go pkg/imports/wx.go |
diffstat | 14 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/agm.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/agm.go Fri Feb 08 15:39:17 2019 +0100 @@ -51,7 +51,7 @@ return "approved gauge measurements" } -func (agmJobCreator) Create(_ JobKind, data string) (Job, error) { +func (agmJobCreator) Create(data string) (Job, error) { agm := new(ApprovedGaugeMeasurements) if err := common.FromJSONString(data, agm); err != nil { return nil, err
--- a/pkg/imports/bn.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/bn.go Fri Feb 08 15:39:17 2019 +0100 @@ -88,7 +88,7 @@ func (bnJobCreator) AutoAccept() bool { return false } -func (bnJobCreator) Create(_ JobKind, data string) (Job, error) { +func (bnJobCreator) Create(data string) (Job, error) { bn := new(Bottleneck) if err := common.FromJSONString(data, bn); err != nil { return nil, err
--- a/pkg/imports/dma.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/dma.go Fri Feb 08 15:39:17 2019 +0100 @@ -51,7 +51,7 @@ func (dmaJobCreator) AutoAccept() bool { return true } -func (dmaJobCreator) Create(_ JobKind, data string) (Job, error) { +func (dmaJobCreator) Create(data string) (Job, error) { dma := new(DistanceMarksAshore) if err := common.FromJSONString(data, dma); err != nil { return nil, err
--- a/pkg/imports/dmv.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/dmv.go Fri Feb 08 15:39:17 2019 +0100 @@ -52,7 +52,7 @@ func (dmvJobCreator) AutoAccept() bool { return true } -func (dmvJobCreator) Create(_ JobKind, data string) (Job, error) { +func (dmvJobCreator) Create(data string) (Job, error) { dmv := new(DistanceMarksVirtual) if err := common.FromJSONString(data, dmv); err != nil { return nil, err
--- a/pkg/imports/fa.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/fa.go Fri Feb 08 15:39:17 2019 +0100 @@ -156,7 +156,7 @@ return "fairway availability" } -func (faJobCreator) Create(_ JobKind, data string) (Job, error) { +func (faJobCreator) Create(data string) (Job, error) { fa := new(FairwayAvailability) if err := common.FromJSONString(data, fa); err != nil { return nil, err
--- a/pkg/imports/fd.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/fd.go Fri Feb 08 15:39:17 2019 +0100 @@ -76,7 +76,7 @@ func (fdJobCreator) AutoAccept() bool { return false } -func (fdJobCreator) Create(_ JobKind, data string) (Job, error) { +func (fdJobCreator) Create(data string) (Job, error) { fd := new(FairwayDimension) if err := common.FromJSONString(data, fd); err != nil { return nil, err
--- a/pkg/imports/gm.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/gm.go Fri Feb 08 15:39:17 2019 +0100 @@ -120,7 +120,7 @@ return "gauge measurements" } -func (gmJobCreator) Create(_ JobKind, data string) (Job, error) { +func (gmJobCreator) Create(data string) (Job, error) { gm := new(GaugeMeasurement) if err := common.FromJSONString(data, gm); err != nil { return nil, err
--- a/pkg/imports/queue.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/queue.go Fri Feb 08 15:39:17 2019 +0100 @@ -73,11 +73,10 @@ // Description is the long name of the import. Description() string // Create build the actual job. - // kind is the name of the import type. // data is a free form string to pass arguments to the creation // process. This is useful to tell e.g. where to find data // in the file system to be used for importing. - Create(kind JobKind, data string) (Job, error) + Create(data string) (Job, error) // Depends returns a list of ressources locked by this type of import. // Imports are run concurrently if they have disjoint sets // of dependencies. @@ -589,7 +588,7 @@ } }() - job, err := jc.Create(idj.kind, idj.data) + job, err := jc.Create(idj.data) if err != nil { errorAndFail(idj.id, "failed to create job for import #%d: %v", idj.id, err)
--- a/pkg/imports/sr.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/sr.go Fri Feb 08 15:39:17 2019 +0100 @@ -77,7 +77,7 @@ func (srJobCreator) AutoAccept() bool { return false } -func (srJobCreator) Create(_ JobKind, data string) (Job, error) { +func (srJobCreator) Create(data string) (Job, error) { sr := new(SoundingResult) if err := common.FromJSONString(data, sr); err != nil { return nil, err
--- a/pkg/imports/st.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/st.go Fri Feb 08 15:39:17 2019 +0100 @@ -46,7 +46,7 @@ func (stJobCreator) AutoAccept() bool { return false } -func (stJobCreator) Create(_ JobKind, data string) (Job, error) { +func (stJobCreator) Create(data string) (Job, error) { st := new(Stretch) if err := common.FromJSONString(data, st); err != nil { return nil, err
--- a/pkg/imports/wa.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/wa.go Fri Feb 08 15:39:17 2019 +0100 @@ -53,7 +53,7 @@ func (waJobCreator) AutoAccept() bool { return true } -func (waJobCreator) Create(_ JobKind, data string) (Job, error) { +func (waJobCreator) Create(data string) (Job, error) { wa := new(WaterwayArea) if err := common.FromJSONString(data, wa); err != nil { return nil, err
--- a/pkg/imports/wg.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/wg.go Fri Feb 08 15:39:17 2019 +0100 @@ -53,7 +53,7 @@ func (wgJobCreator) AutoAccept() bool { return true } -func (wgJobCreator) Create(_ JobKind, data string) (Job, error) { +func (wgJobCreator) Create(data string) (Job, error) { wg := new(WaterwayGauge) if err := common.FromJSONString(data, wg); err != nil { return nil, err
--- a/pkg/imports/wp.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/wp.go Fri Feb 08 15:39:17 2019 +0100 @@ -61,7 +61,7 @@ RegisterJobCreator(WPJobKind, wpJobCreator{}) } -func (wpJobCreator) Create(_ JobKind, data string) (Job, error) { +func (wpJobCreator) Create(data string) (Job, error) { wp := new(WaterwayProfiles) if err := common.FromJSONString(data, wp); err != nil { return nil, err
--- a/pkg/imports/wx.go Fri Feb 08 15:30:16 2019 +0100 +++ b/pkg/imports/wx.go Fri Feb 08 15:39:17 2019 +0100 @@ -52,7 +52,7 @@ func (wxJobCreator) AutoAccept() bool { return true } -func (wxJobCreator) Create(_ JobKind, data string) (Job, error) { +func (wxJobCreator) Create(data string) (Job, error) { wx := new(WaterwayAxis) if err := common.FromJSONString(data, wx); err != nil { return nil, err