Skip to content

Commit e4d1a27

Browse files
authored
Merge pull request #191 from grisu48/panic
Fix panic when RequestJobLimit is not set
2 parents 8807bb9 + a927c92 commit e4d1a27

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cmd/openqa-revtui/openqa-revtui.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func parseProgramArgs(cf *Config) ([]Config, error) {
3434
}
3535
filename := os.Args[i]
3636
var cf Config
37+
cf.RequestJobLimit = 100 // Set default limit
3738
if err := cf.LoadToml(filename); err != nil {
3839
return cfs, fmt.Errorf("in %s: %s", filename, err)
3940
}

cmd/openqa-revtui/openqa.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,13 @@ func fetchJobsFollow(ids []int64, model *TUIModel, progress func(i, n int)) ([]g
103103
// We split the job ids into multiple requests if necessary
104104
jobs := make([]gopenqa.Job, 0)
105105
// Progress variables
106-
chunks := len(ids) / model.Config.RequestJobLimit
106+
limit := model.Config.RequestJobLimit
107+
if limit <= 0 {
108+
limit = len(ids)
109+
}
110+
chunks := len(ids) / limit
107111
for i := 0; len(ids) > 0; i++ { // Repeat until no more ids are available.
108-
n := min(model.Config.RequestJobLimit, len(ids))
112+
n := min(limit, len(ids))
109113
chunk, err := model.Instance.GetJobsFollow(ids[:n])
110114
if progress != nil {
111115
progress(i, chunks)

0 commit comments

Comments
 (0)