aboutsummaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-09-26 22:39:32 +0200
committerLudovic Courtès <ludo@gnu.org>2020-09-29 21:56:26 +0200
commit118b6dbb46ff3376db7467301fe59673c042d220 (patch)
treebb142eeaeaa4f9b5f6cc2a42e6734884763865fa /gnu/build
parentdabb00ffee94cea6e2fbd3b356eb57f5292fdb27 (diff)
downloadguix-118b6dbb46ff3376db7467301fe59673c042d220.tar
guix-118b6dbb46ff3376db7467301fe59673c042d220.tar.gz
secret-service: Clarify the origin of messages.
* gnu/build/secret-service.scm (secret-service-send-secrets) (secret-service-receive-secrets): Prefix messages by "secret service".
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/secret-service.scm17
1 files 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))