[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#43650] [PATCH 3/8] secret-service: Clarify the origin of messages.
From: |
Ludovic Courtès |
Subject: |
[bug#43650] [PATCH 3/8] secret-service: Clarify the origin of messages. |
Date: |
Sun, 27 Sep 2020 17:32:16 +0200 |
* gnu/build/secret-service.scm (secret-service-send-secrets)
(secret-service-receive-secrets): Prefix messages by "secret service".
---
gnu/build/secret-service.scm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/gnu/build/secret-service.scm b/gnu/build/secret-service.scm
index 781651e90d..aafb1684b5 100644
--- a/gnu/build/secret-service.scm
+++ b/gnu/build/secret-service.scm
@@ -54,11 +54,14 @@ local PORT. If connect fails, sleep 1s and retry RETRY
times."
(lambda (key . args)
(when (zero? retry)
(apply throw key args))
- (format (current-error-port) "retrying connection~%")
+ (format (current-error-port)
+ "secret service: retrying connection [~a attempts left]~%"
+ (- retry 1))
(sleep 1)
(loop (1- retry)))))
- (format (current-error-port) "connected! sending files in ~s %~"
+ (format (current-error-port)
+ "secret service: connected; sending files in ~s~%"
secret-root)
(let* ((files (if secret-root (find-files secret-root) '()))
(files-sizes-modes (map file->file+size+mode files))
@@ -82,11 +85,12 @@ Write them to the file system."
(bind sock AF_INET INADDR_ANY port)
(listen sock 1)
(format (current-error-port)
- "waiting for secrets on port ~a...~%"
+ "secret service: waiting for secrets on port ~a...~%"
port)
(match (accept sock)
((client . address)
- (format (current-error-port) "client connection from ~a~%"
+ (format (current-error-port)
+ "secret service: client connection from ~a~%"
(inet-ntop (sockaddr:fam address)
(sockaddr:addr address)))
(close-port sock)
@@ -116,7 +120,8 @@ Write them to the file system."
('files ((files sizes modes) ...)))
(for-each (lambda (file size mode)
(format (current-error-port)
- "installing file '~a' (~a bytes)...~%"
+ "secret service: \
+installing file '~a' (~a bytes)...~%"
file size)
(mkdir-p (dirname file))
(call-with-output-file file
@@ -126,7 +131,7 @@ Write them to the file system."
files sizes modes))
(_
(format (current-error-port)
- "invalid secrets received~%")
+ "secret service: invalid secrets received~%")
#f)))
(let* ((port (wait-for-client port))
--
2.28.0
[bug#43650] [PATCH 5/8] services: guix: Generate key pair if needed during activation., Ludovic Courtès, 2020/09/27
[bug#43650] [PATCH 6/8] services: hurd-vm: Initialize the guest's SSH/Guix keys at activation time., Ludovic Courtès, 2020/09/27
[bug#43650] [PATCH 7/8] services: hurd-vm: Pass "-no-reboot" when spawning the Hurd VM., Ludovic Courtès, 2020/09/27
[bug#43650] [PATCH 8/8] secret-service: Add a timeout when waiting for a client., Ludovic Courtès, 2020/09/27
[bug#43650] [PATCH 1/8] services: hurd-vm: Run QEMU as an unprivileged user., Jan Nieuwenhuizen, 2020/09/28