guix
/
data-service
mirror of git://git.savannah.gnu.org/guix/data-service.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Remove logging from enqueue-job-for-email 

As getmail treats output to stderr as the operation failing.
This commit is contained in:
Christopher Baines 2023-10-11 14:17:11 +01:00
parent b0404d62fd
commit d72b9a5239
1 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
guix-data-service/branch-updated-emails.scm
View File

@ -23,6 +23,7 @@
#:use-module (squee) #:use-module (squee)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix channels) #:use-module (guix channels)
#:use-module (guix diagnostics)
#:use-module (guix-data-service database) #:use-module (guix-data-service database)
#:use-module (guix-data-service model git-repository) #:use-module (guix-data-service model git-repository)
#:use-module (guix-data-service model git-branch) #:use-module (guix-data-service model git-branch)
@ -89,47 +90,43 @@
(channel-instance (channel-instance
;; Obtain a session level lock here, to avoid conflicts with ;; Obtain a session level lock here, to avoid conflicts with
;; other jobs over the Git repository. ;; other jobs over the Git repository.
(with-advisory-session-lock/log-time (with-advisory-session-lock
conn conn
'latest-channel-instances 'latest-channel-instances
(lambda () (lambda ()
(with-store store (parameterize ((current-output-port (%make-void-port "w"))
(first (current-error-port (%make-void-port "w"))
(latest-channel-instances store (guix-warning-port (%make-void-port "w")))
(list channel-for-commit) (with-store store
#:authenticate? (first
(fourth git-repository-details)))))))) (latest-channel-instances store
(list channel-for-commit)
#:authenticate?
(fourth git-repository-details)))))))))
(if (string=? (channel-instance-commit channel-instance) (when (string=? (channel-instance-commit channel-instance)
x-git-newrev) x-git-newrev)
(with-postgresql-transaction (with-postgresql-transaction
conn conn
(lambda (conn) (lambda (conn)
(exec-query conn "LOCK TABLE git_commits IN EXCLUSIVE MODE") (exec-query conn "LOCK TABLE git_commits IN EXCLUSIVE MODE")
(if (git-commit-exists? conn x-git-newrev) (unless (git-commit-exists? conn x-git-newrev)
(simple-format #t "commit already exists for revision ~A (date: ~A)\n" (insert-git-commit-entry conn
x-git-newrev (or (git-branch-for-repository-and-name
date) conn
(begin git-repository-id
(insert-git-commit-entry conn branch-name)
(or (git-branch-for-repository-and-name (insert-git-branch-entry
conn conn
git-repository-id git-repository-id
branch-name) branch-name))
(insert-git-branch-entry x-git-newrev
conn date)
git-repository-id
branch-name))
x-git-newrev
date)
(enqueue-load-new-guix-revision-job (enqueue-load-new-guix-revision-job
conn conn
git-repository-id git-repository-id
x-git-newrev x-git-newrev
(string-append x-git-repo " " (string-append x-git-repo " "
x-git-refname " updated")))))) x-git-refname " updated"))))))))))))))))
(simple-format #t "email newrev ~A doesn't match latest channel instance commit ~A\n"
x-git-newrev
(channel-instance-commit channel-instance)))))))))))))