gogs/truckstop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ntg vision doesnt export excess

Browse Source
This commit is contained in:
Bel LaPointe
2022-01-27 12:54:41 -07:00
parent b02f0f28c8
commit 16bf70a276
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
broker/ntgvision.go
View File

@@ -16,7 +16,7 @@ import (
type NTGVision struct {
searcher interface {
search(states []config.State) (io.ReadCloser, error)
searchJob(id int64) (io.ReadCloser, error)
searchJobReadCloser(id int64) (io.ReadCloser, error)
}
}
@@ -96,7 +96,7 @@ func (ntgJob *ntgVisionJob) JobInfo() (ntgVisionJobInfo, error) {
return ntgJob.jobinfo, nil
}
ntg := NewNTGVision()
ji, err := ntg.SearchJob(ntgJob.ID)
ji, err := ntg.searchJob(ntgJob.ID)
if err == nil {
ntgJob.jobinfo = ji
b, err := json.Marshal(ntgJob.jobinfo)
@@ -107,7 +107,7 @@ func (ntgJob *ntgVisionJob) JobInfo() (ntgVisionJobInfo, error) {
return ji, err
}
func (ntg NTGVision) searchJob(id int64) (io.ReadCloser, error) {
func (ntg NTGVision) searchJobReadCloser(id int64) (io.ReadCloser, error) {
time.Sleep(config.Get().Interval.JobInfo.Get())
request, err := http.NewRequest(http.MethodGet, fmt.Sprintf(config.Get().Brokers.NTG.LoadPageAPIURIFormat, id), nil)
if err != nil {
@@ -169,8 +169,8 @@ func (ntg NTGVision) WithMock() NTGVision {
return ntg
}
func (ntg NTGVision) SearchJob(id int64) (ntgVisionJobInfo, error) {
rc, err := ntg.searcher.searchJob(id)
func (ntg NTGVision) searchJob(id int64) (ntgVisionJobInfo, error) {
rc, err := ntg.searcher.searchJobReadCloser(id)
if err != nil {
return ntgVisionJobInfo{}, err
}

2
broker/ntgvision_mock.go
View File

@@ -21,7 +21,7 @@ func (ntgm NTGVisionMock) search(states []config.State) (io.ReadCloser, error) {
return io.NopCloser(bytes.NewReader(b)), err
}
func (ntgm NTGVisionMock) searchJob(id int64) (io.ReadCloser, error) {
func (ntgm NTGVisionMock) searchJobReadCloser(id int64) (io.ReadCloser, error) {
path := path.Join(os.Getenv("GOPATH"), "src", "local", "truckstop", "broker", "testdata", "ntgvision_jobinfo_response.json")
b, err := ioutil.ReadFile(path)
return io.NopCloser(bytes.NewReader(b)), err