diff options
Diffstat (limited to 'guix-data-service')
| -rw-r--r-- | guix-data-service/data-deletion.scm | 9 | ||||
| -rw-r--r-- | guix-data-service/poll-git-repository.scm | 12 | ||||
| -rw-r--r-- | guix-data-service/web/repository/controller.scm | 3 | ||||
| -rw-r--r-- | guix-data-service/web/revision/controller.scm | 13 |
4 files changed, 29 insertions, 8 deletions
diff --git a/guix-data-service/data-deletion.scm b/guix-data-service/data-deletion.scm index c9dc631..e75fe42 100644 --- a/guix-data-service/data-deletion.scm +++ b/guix-data-service/data-deletion.scm @@ -255,10 +255,11 @@ WHERE git_repository_id = $1 (list (number->string git-repository-id) branch-name)))) - (delete-revisions-from-branch conn - git-repository-id - branch-name - commits) + (unless (null? commits) + (delete-revisions-from-branch conn + git-repository-id + branch-name + commits)) (exec-query conn diff --git a/guix-data-service/poll-git-repository.scm b/guix-data-service/poll-git-repository.scm index 2ed5644..8dfd13d 100644 --- a/guix-data-service/poll-git-repository.scm +++ b/guix-data-service/poll-git-repository.scm @@ -99,6 +99,9 @@ conn 'latest-channel-instances (lambda () + (simple-format (current-error-port) + "polling git repository ~A\n" + git-repository-id) ;; This was using update-cached-checkout, but it wants to checkout ;; refs/remotes/origin/HEAD by default, and that can fail for some reason ;; on some repositories: @@ -158,6 +161,15 @@ oid->string))))) (branch-list repository BRANCH-REMOTE))))) + (simple-format (current-error-port) + "git repository ~A: excluded branches: ~A\n" + git-repository-id + excluded-branches) + (simple-format (current-error-port) + "git repository ~A: included branches: ~A\n" + git-repository-id + included-branches) + (with-postgresql-transaction conn (lambda (conn) diff --git a/guix-data-service/web/repository/controller.scm b/guix-data-service/web/repository/controller.scm index b77ca1f..0d9434c 100644 --- a/guix-data-service/web/repository/controller.scm +++ b/guix-data-service/web/repository/controller.scm @@ -267,7 +267,8 @@ #:path-base path #:header-text `("Latest processed revision for branch " - (samp ,branch-name))) + (samp ,branch-name)) + #:max-age 60) (render-no-latest-revision mime-types repository-id branch-name)))) diff --git a/guix-data-service/web/revision/controller.scm b/guix-data-service/web/revision/controller.scm index 114e9f4..aa7f226 100644 --- a/guix-data-service/web/revision/controller.scm +++ b/guix-data-service/web/revision/controller.scm @@ -446,7 +446,8 @@ commit-hash #:key path-base (header-text - `("Revision " (samp ,commit-hash)))) + `("Revision " (samp ,commit-hash))) + (max-age cache-control-default-max-age)) (letpar& ((packages-count (with-resource-from-pool (connection-pool) conn (count-packages-in-revision conn commit-hash))) @@ -484,7 +485,10 @@ (network_dependent . ,(string=? network-dependent "t")) (count . ,(string->number count)))))) lint-warning-counts))) - #:extra-headers http-headers-for-unchanging-content)) + #:extra-headers + `((cache-control + . (public + (max-age . ,max-age)))))) (else (render-html #:sxml (view-revision @@ -496,7 +500,10 @@ lint-warning-counts #:path-base path-base #:header-text header-text) - #:extra-headers http-headers-for-unchanging-content))))) + #:extra-headers + `((cache-control + . (public + (max-age . ,max-age))))))))) (define* (render-revision-system-tests mime-types commit-hash |