cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define a new parameter for a port used for the inferior error output

Browse source
This commit is contained in:
Christopher Baines 2020-02-15 13:41:17 +00:00
parent 773e5a9c38
commit 46c8ce5b82
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -115,6 +115,9 @@
(define real-error-port (define real-error-port
(make-parameter (current-error-port))) (make-parameter (current-error-port)))
(define inferior-error-port
(make-parameter (current-error-port)))
(define* (log-for-job conn job-id (define* (log-for-job conn job-id
#:key #:key
character-limit character-limit
@ -799,7 +802,7 @@ WHERE job_id = $1"
(begin (begin
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior (guix-store-path store) (open-inferior (guix-store-path store)
#:error-port (real-error-port)))))) #:error-port (inferior-error-port))))))
(define (start-inferior-and-return-derivation-file-names) (define (start-inferior-and-return-derivation-file-names)
;; /etc is only missing if open-inferior/container has been used ;; /etc is only missing if open-inferior/container has been used
@ -918,7 +921,7 @@ WHERE job_id = $1"
(begin (begin
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior store-path (open-inferior store-path
#:error-port (real-error-port)))))) #:error-port (inferior-error-port))))))
(inferior-eval '(use-modules (srfi srfi-1) (inferior-eval '(use-modules (srfi srfi-1)
(srfi srfi-34) (srfi srfi-34)
(guix grafts) (guix grafts)
@ -977,7 +980,7 @@ WHERE job_id = $1"
(setenv "GUIX_LOCPATH" guix-locpath) (setenv "GUIX_LOCPATH" guix-locpath)
(simple-format #t "debug: using open-inferior\n") (simple-format #t "debug: using open-inferior\n")
(open-inferior store-path (open-inferior store-path
#:error-port (real-error-port))))))) #:error-port (inferior-error-port)))))))
(setenv "GUIX_LOCPATH" guix-locpath) ; restore GUIX_LOCPATH (setenv "GUIX_LOCPATH" guix-locpath) ; restore GUIX_LOCPATH
(when (eq? inf #f) (when (eq? inf #f)
@ -1547,7 +1550,8 @@ SKIP LOCKED")
(set-current-error-port logging-port) (set-current-error-port logging-port)
(let ((result (let ((result
(parameterize ((current-build-output-port logging-port) (parameterize ((current-build-output-port logging-port)
(real-error-port previous-error-port)) (real-error-port previous-error-port)
(inferior-error-port previous-error-port))
(catch #t (catch #t
(lambda () (lambda ()
(with-store-connection (with-store-connection