Compare commits

..

3 Commits

Author SHA1 Message Date
bel
6ea4d4700c whoops dont reuse not same uri 2022-01-18 06:40:55 -07:00
bel
451f741f5a wrap errs for easier read 2022-01-18 06:37:06 -07:00
bel
ecf22c3a3d todo 2022-01-17 22:04:57 -07:00
6 changed files with 24 additions and 14 deletions

View File

@@ -93,7 +93,7 @@ func (ntgJob *ntgVisionJob) JobInfo() (ntgVisionJobInfo, error) {
key := fmt.Sprintf("ntg_job_info_%v", ntgJob.ID)
if b, err := db.Get(key); err != nil {
} else if err := json.Unmarshal(b, &ntgJob.jobinfo); err == nil {
return ntgJob.jobinfo, nil
return ntgJob.jobinfo, fmt.Errorf("failed to parse ntg job info from db: %w: %s", err, b)
}
ntg := NewNTGVision()
ji, err := ntg.SearchJob(ntgJob.ID)
@@ -109,7 +109,7 @@ func (ntgJob *ntgVisionJob) JobInfo() (ntgVisionJobInfo, error) {
func (ntg NTGVision) searchJob(id int64) (io.ReadCloser, error) {
time.Sleep(config.Get().Interval.JobInfo.Get())
request, err := http.NewRequest(http.MethodGet, fmt.Sprintf(config.Get().Brokers.NTG.LoadPageURIFormat, id), nil)
request, err := http.NewRequest(http.MethodGet, fmt.Sprintf(config.Get().Brokers.NTG.LoadPageAPIURIFormat, id), nil)
if err != nil {
return nil, err
}
@@ -175,8 +175,15 @@ func (ntg NTGVision) SearchJob(id int64) (ntgVisionJobInfo, error) {
return ntgVisionJobInfo{}, err
}
defer rc.Close()
b, err := ioutil.ReadAll(rc)
if err != nil {
return ntgVisionJobInfo{}, fmt.Errorf("failed to readall search job result: %w", err)
}
var result ntgVisionJobInfo
err = json.NewDecoder(rc).Decode(&result)
err = json.Unmarshal(b, &result)
if err != nil {
err = fmt.Errorf("failed to parse job info: %w: %s", err, b)
}
return result, err
}

View File

@@ -75,6 +75,7 @@
"JobInfo": true,
"Mock": true,
"LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
"LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId==%d",
"Username": "noeasyrunstrucking@gmail.com",
"Password": "thumper1234"
}

View File

@@ -65,11 +65,12 @@ type Config struct {
Once bool
Brokers struct {
NTG struct {
JobInfo bool
Mock bool
LoadPageURIFormat string
Username string
Password string
JobInfo bool
Mock bool
LoadPageURIFormat string
LoadPageAPIURIFormat string
Username string
Password string
}
}

View File

@@ -90,7 +90,9 @@ func logf(l Level, format string, args []interface{}) {
}
fmt.Fprintf(logger, format, args...)
if l == SOS && cAnsoser != nil {
cAnsoser.Send(fmt.Sprintf(format, args...))
if err := cAnsoser.Send(fmt.Sprintf(format, args...)); err != nil {
Errorf("failed to SOS: %v", err)
}
}
}

View File

@@ -9,7 +9,6 @@ import (
"local/truckstop/config"
"local/truckstop/logtr"
"local/truckstop/message"
"log"
"net/http"
"net/url"
"regexp"
@@ -333,7 +332,6 @@ func updateDeadJobs(jobs []broker.Job) error {
if err != nil {
return err
}
log.Printf("db.List() => %+v", list)
for _, listEntry := range list {
wouldBe := strings.TrimPrefix(listEntry, "sent_job_")
found := false

View File

@@ -1,10 +1,10 @@
todo:
- mark jobs no longer avail by modifying in matrix;; save matrix ID over dummy payload
- recv-as for clients so pa receives mas commands as writes
- TEST. Just like, refactor and test to shit.
- try search ntg by autoinc?
- test each !command callbacks to matrix
- recv-as for clients so pa receives mas commands as writes
- continuation is garbo, but I can still do better client side to avoid get-set high level
- no hard code jpeg or have it in multiple places
- test each !command callbacks to matrix
- change matrix so I test my custom logic even if I dont fetch remote
- warn/err/etc. on clobbering ids.matrix since clients can mess with one another
- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
@@ -14,6 +14,7 @@ todo:
- banlist criteria like vendors, brokers, metadata
- set up copy for caleb, broc
done:
- mark jobs no longer avail by modifying in matrix;; save matrix ID over dummy payload
- TEST its falling apart
- help() log on truckstop for stuff like perma 403
- figure out zoom on maps;; is there like an auto-zoom I can leverage?