diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-06-24 15:40:06 +0200 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-06-24 15:40:06 +0200 |
| commit | 8bfd36fe774aff71f9a33fd99e42d578a823750d (patch) | |
| tree | 78d5973404e4874f958891bf9121ea7c88ef53af | |
| parent | 586982fc7e9591351dffe1a234fa088a889d97fb (diff) | |
| download | nar-herder-trunk.tar nar-herder-trunk.tar.gz | |
Use #:delay-seconds instead of #:delaytrunk
To match the build coordinator.
| -rw-r--r-- | nar-herder/database.scm | 2 | ||||
| -rw-r--r-- | nar-herder/mirror.scm | 2 | ||||
| -rw-r--r-- | nar-herder/storage.scm | 6 | ||||
| -rw-r--r-- | nar-herder/utils.scm | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/nar-herder/database.scm b/nar-herder/database.scm index 2b7b46a..84bd6f2 100644 --- a/nar-herder/database.scm +++ b/nar-herder/database.scm @@ -451,7 +451,7 @@ PRAGMA optimize;"))) db (database-file database))))) #:times 5 - #:delay 5)) + #:delay-seconds 5)) (define (database-spawn-fibers database) (spawn-fiber diff --git a/nar-herder/mirror.scm b/nar-herder/mirror.scm index e59f80e..5355b13 100644 --- a/nar-herder/mirror.scm +++ b/nar-herder/mirror.scm @@ -94,7 +94,7 @@ (uri->string uri) (response-code response)))))))) #:times 3 - #:delay 15)) + #:delay-seconds 15)) #:timeout 30))) (let* ((recent-changes diff --git a/nar-herder/storage.scm b/nar-herder/storage.scm index 0e7186d..f2d2436 100644 --- a/nar-herder/storage.scm +++ b/nar-herder/storage.scm @@ -447,7 +447,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." (eq? (assoc-ref json-body "stored") #t))))))) #:times 3 - #:delay 5)) + #:delay-seconds 5)) #:timeout 30))))) (define (nar-can-be-removed? nar) @@ -687,7 +687,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." (lambda () (fetch-file (assq-ref file 'url))) #:times 3 - #:delay 5)) + #:delay-seconds 5)) (lambda _ (backtrace))) #t) @@ -731,7 +731,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." (lambda () (fetch-file url)) #:times 3 - #:delay 5) + #:delay-seconds 5) 1) #:unwind? #t))))))))) (iota parallelism)) diff --git a/nar-herder/utils.scm b/nar-herder/utils.scm index 4155ea0..e93217f 100644 --- a/nar-herder/utils.scm +++ b/nar-herder/utils.scm @@ -49,7 +49,7 @@ check-locale!)) -(define* (retry-on-error f #:key times delay ignore error-hook) +(define* (retry-on-error f #:key times delay-seconds ignore error-hook) (let loop ((attempt 1)) (match (with-exception-handler (lambda (exn) @@ -89,10 +89,10 @@ exn attempt times - delay) + delay-seconds) (when error-hook (error-hook attempt exn)) - (sleep delay) + (sleep delay-seconds) (simple-format (current-error-port) "running last retry of ~A after ~A failed attempts\n" @@ -107,10 +107,10 @@ exn attempt times - delay) + delay-seconds) (when error-hook (error-hook attempt exn)) - (sleep delay) + (sleep delay-seconds) (loop (+ 1 attempt)))))))) (define (call-with-time-logging name thunk) |