diff options
author | Julien Dessaux | 2020-02-24 23:05:45 +0100 |
---|---|---|
committer | Julien Dessaux | 2020-02-25 09:46:38 +0100 |
commit | cadb15f7afb5e7c88667eb4006209efca17744af (patch) | |
tree | 7e8e9e55c22bd4d195caf2b1dc1123500443ce75 /job/utils.go | |
parent | Added tests to the spool package, and reworked the code around that. (diff) | |
download | bareos-zabbix-check-cadb15f7afb5e7c88667eb4006209efca17744af.tar.gz bareos-zabbix-check-cadb15f7afb5e7c88667eb4006209efca17744af.tar.bz2 bareos-zabbix-check-cadb15f7afb5e7c88667eb4006209efca17744af.zip |
Added tests to the main package and completely reworked the code around that1.0
Diffstat (limited to '')
-rw-r--r-- | job/utils.go | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/job/utils.go b/job/utils.go index 33c25cd..a6a2f43 100644 --- a/job/utils.go +++ b/job/utils.go @@ -1,25 +1,32 @@ package job // KeepOldestOnly filters a job list and keeps only the most recent entry for a job name -func KeepOldestOnly(jobs []Job) []Job { - tmpMap := make(map[string]Job) - for _, elt := range jobs { - prev, exists := tmpMap[elt.Name] - if !exists || (exists && prev.Timestamp < elt.Timestamp) { - tmpMap[elt.Name] = elt +func KeepOldestOnly(jobs []Job) (results []Job) { +outerLoop: + for i := 0; i < len(jobs); i++ { + job := jobs[i] + for j := 0; j < len(results); j++ { + result := results[j] + if result.Name == job.Name { + continue outerLoop + } } + for j := i + 1; j < len(jobs); j++ { + sec := jobs[j] + if sec.Name == job.Name && sec.Timestamp > job.Timestamp { + job = sec + } + } + results = append(results, job) } - values := make([]Job, 0, len(tmpMap)) - for _, value := range tmpMap { - values = append(values, value) - } - return values + return } // KeepSuccessOnly returns only the successful jobs from a job list (suiatble to write a new spool file) func KeepSuccessOnly(jobs []Job) (result []Job) { result = make([]Job, 0) - for _, job := range jobs { + for i := 0; i < len(jobs); i++ { + job := jobs[i] if job.Success { result = append(result, job) } |