diff options
| -rw-r--r-- | nar-herder/cached-compression.scm | 6 | ||||
| -rw-r--r-- | nar-herder/server.scm | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nar-herder/cached-compression.scm b/nar-herder/cached-compression.scm index 0cb7e1d..c5621b0 100644 --- a/nar-herder/cached-compression.scm +++ b/nar-herder/cached-compression.scm @@ -404,7 +404,8 @@ database cached-compression-management-channel enabled-cached-compressions - cached-compression-removal-fiber-wakeup-channel) + cached-compression-removal-fiber-wakeup-channel + base-ttl) (define (files-to-schedule-for-removal compression-details) (let* ((directory (assq-ref compression-details 'directory)) @@ -450,7 +451,8 @@ (current-time) (make-time time-duration 0 - (assq-ref compression-details 'ttl))))) + (or (assq-ref compression-details 'ttl) + base-ttl))))) (database-insert-scheduled-cached-narinfo-removal database (assq-ref cached-narinfo-file-details 'id) diff --git a/nar-herder/server.scm b/nar-herder/server.scm index 6d9d553..a99e278 100644 --- a/nar-herder/server.scm +++ b/nar-herder/server.scm @@ -842,7 +842,10 @@ database cached-compression-management-channel enabled-cached-compressions - cached-compression-removal-fiber-wakeup-channel))) + cached-compression-removal-fiber-wakeup-channel + (or (assq-ref opts 'narinfo-ttl) + ;; Default from (guix substitutes) + (* 36 3600))))) (log-msg 'DEBUG "finished maintenance setup") (wait finished?)) |