me
/
guix
Archived
1
0
Fork 0
Code

publish: Save bandwidth on narinfo 404s. 

This saves 18 bytes on each 404 narinfo response.

* guix/scripts/publish.scm (render-narinfo): Pass #:phrase to
'not-found'.
(render-narinfo/cached): Likewise.
master
Ludovic Courtès 2018-01-06 14:43:45 +01:00
parent af3f7f22f4
commit f396611776
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/scripts/publish.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -326,7 +326,7 @@ advertise it as the maximum validity period (in seconds) via the
appropriate duration. NAR-PATH specifies the prefix for nar URLs." appropriate duration. NAR-PATH specifies the prefix for nar URLs."
(let ((store-path (hash-part->path store hash))) (let ((store-path (hash-part->path store hash)))
(if (string-null? store-path) (if (string-null? store-path)
(not-found request) (not-found request #:phrase "")
(values `((content-type . (application/x-nix-narinfo)) (values `((content-type . (application/x-nix-narinfo))
,@(if ttl ,@(if ttl
`((cache-control (max-age . ,ttl))) `((cache-control (max-age . ,ttl)))
@ -461,7 +461,7 @@ requested using POOL."
#:phrase "We're baking it" #:phrase "We're baking it"
#:ttl 300)) ;should be available within 5m #:ttl 300)) ;should be available within 5m
(else (else
(not-found request))))) (not-found request #:phrase "")))))
(define* (bake-narinfo+nar cache item (define* (bake-narinfo+nar cache item
#:key ttl (compression %no-compression) #:key ttl (compression %no-compression)