diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-03-23 10:25:20 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-03-23 10:25:34 +0000 |
| commit | 22d2e260a6ee7a28e635ac9a60b18cc9cdf8ba7e (patch) | |
| tree | 09710d2573962ca56bc5c35288e868458f6e4c95 | |
| parent | ccef906e8ee1f370850734f1e66fcc164ffd5dd7 (diff) | |
| download | nar-herder-22d2e260a6ee7a28e635ac9a60b18cc9cdf8ba7e.tar nar-herder-22d2e260a6ee7a28e635ac9a60b18cc9cdf8ba7e.tar.gz | |
Rename with-fibers-port-timeouts to with-port-timeouts
As it works with or without fibers.
| -rw-r--r-- | nar-herder/cached-compression.scm | 2 | ||||
| -rw-r--r-- | nar-herder/mirror.scm | 2 | ||||
| -rw-r--r-- | nar-herder/server.scm | 2 | ||||
| -rw-r--r-- | nar-herder/storage.scm | 4 | ||||
| -rw-r--r-- | nar-herder/utils.scm | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/nar-herder/cached-compression.scm b/nar-herder/cached-compression.scm index 6148c7e..e4fa52f 100644 --- a/nar-herder/cached-compression.scm +++ b/nar-herder/cached-compression.scm @@ -474,7 +474,7 @@ (delete-file filename) (raise-exception exn)) (lambda () - (with-fibers-port-timeouts + (with-port-timeouts (lambda () (call-with-values (lambda () diff --git a/nar-herder/mirror.scm b/nar-herder/mirror.scm index bf5c11e..47ae549 100644 --- a/nar-herder/mirror.scm +++ b/nar-herder/mirror.scm @@ -69,7 +69,7 @@ (lambda () (log-msg 'INFO "querying for recent changes since " latest-recent-change) - (with-fibers-port-timeouts + (with-port-timeouts (lambda () (let ((port socket diff --git a/nar-herder/server.scm b/nar-herder/server.scm index 745cfa5..7d6e834 100644 --- a/nar-herder/server.scm +++ b/nar-herder/server.scm @@ -508,7 +508,7 @@ (string->uri (string-append (assq-ref opts 'mirror) "/latest-database-dump")))) - (with-fibers-port-timeouts + (with-port-timeouts (lambda () (call-with-values (lambda () diff --git a/nar-herder/storage.scm b/nar-herder/storage.scm index c1db3f5..a40e125 100644 --- a/nar-herder/storage.scm +++ b/nar-herder/storage.scm @@ -391,7 +391,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." (store-path-hash-part (assq-ref narinfo 'store-path)) ".narinfo/info")))) - (with-fibers-port-timeouts + (with-port-timeouts (lambda () (call-with-values (lambda () @@ -559,7 +559,7 @@ When VERIFY-CERTIFICATE? is true, verify HTTPS server certificates." (raise-exception exn)) (lambda () - (with-fibers-port-timeouts + (with-port-timeouts (lambda () (call-with-values (lambda () diff --git a/nar-herder/utils.scm b/nar-herder/utils.scm index 92584d9..26d10bc 100644 --- a/nar-herder/utils.scm +++ b/nar-herder/utils.scm @@ -70,7 +70,7 @@ port-read-timeout-error? port-write-timeout-error? - with-fibers-port-timeouts)) + with-port-timeouts)) (define* (retry-on-error f #:key times delay ignore error-hook) (let loop ((attempt 1)) @@ -769,10 +769,10 @@ If already in the worker thread, call PROC immediately." (define port-write-timeout-error? (record-predicate &port-write-timeout)) -(define* (with-fibers-port-timeouts thunk - #:key timeout - (read-timeout timeout) - (write-timeout timeout)) +(define* (with-port-timeouts thunk + #:key timeout + (read-timeout timeout) + (write-timeout timeout)) (define (no-fibers-wait port mode timeout) (define poll-timeout-ms 200) |