[no subject]

[Mathieu Othacehe]

branch: master
commit 659e7479e52c626f865ba7adafdb2d6a1c4053e5
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Mar 12 17:33:29 2021 +0100

    Fix workers status page.
---
 src/cuirass/database.scm | 10 ++++++----
 src/cuirass/http.scm     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm
index 6ff04c2..5ef64e5 100644
--- a/src/cuirass/database.scm
+++ b/src/cuirass/database.scm
@@ -651,11 +651,13 @@ WHERE job_name  = " job-name "AND specification = " 
specification
        (string->number time))
       (else #f))))
 
-(define (db-get-build-percentages build-ids)
-  (define builds
+(define (db-get-build-percentages builds)
+  (define build-ids
     (format #f "{~a}"
             (string-join
-             (map number->string build-ids) ",")))
+             (map number->string
+                  (map (cut assq-ref <> #:id) builds))
+             ",")))
 
   (with-db-worker-thread db
     (let loop ((rows
@@ -665,7 +667,7 @@ FROM (SELECT  DISTINCT ON (b1.id) b1.id AS id,
 GREATEST((b2.stoptime - b2.starttime), 1) AS last_duration,
 (extract(epoch from now())::int - b1.starttime) AS duration FROM builds AS b1
 LEFT JOIN builds AS b2 ON b1.job_name = b2.job_name WHERE b1.id IN
-(SELECT id FROM builds WHERE id = ANY(" builds "))
+(SELECT id FROM builds WHERE id = ANY(" build-ids "))
 AND b2.status >= 0 ORDER BY b1.id,  b2.id DESC) d;"))
                (percentages '()))
       (match rows
diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index fdc71cf..450f5f0 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -862,7 +862,7 @@ into a specification record and return it."
               (builds*
                (map (lambda (build percentage)
                       `(,@build
-                        #:percentage . ,percentage))
+                        (#:percentage . ,percentage)))
                     builds percentages)))
          (workers-status workers builds*))
        '())))