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

wrap errs for easier read

master
bel 2022-01-18 06:37:06 -07:00
parent ecf22c3a3d
commit 451f741f5a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
broker/ntgvision.go
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)
@ -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
}

4
logtr/log.go
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)
}
}
}