From: "Ludovic Courtès" <ludo@gnu.org>
To: 43650@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>, janneke@gnu.org
Subject: [bug#43650] [PATCH 3/8] secret-service: Clarify the origin of messages.
Date: Sun, 27 Sep 2020 17:32:16 +0200 [thread overview]
Message-ID: <20200927153221.9154-3-ludo@gnu.org> (raw)
In-Reply-To: <20200927153221.9154-1-ludo@gnu.org>
* 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
next prev parent reply other threads:[~2020-09-27 15:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-27 15:29 [bug#43650] [PATCH 0/8] Assorted childhurd improvements Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 1/8] services: hurd-vm: Run QEMU as an unprivileged user Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 2/8] services: childhurd: Tweak description Ludovic Courtès
2020-09-27 15:32 ` Ludovic Courtès [this message]
2020-09-27 15:32 ` [bug#43650] [PATCH 4/8] services: hurd-vm: Check whether /dev/kvm exists at run time Ludovic Courtès
2020-09-28 17:02 ` Jan Nieuwenhuizen
2020-09-29 10:10 ` Ludovic Courtès
2020-09-29 14:22 ` Jan Nieuwenhuizen
2020-09-29 20:13 ` bug#43650: " Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 5/8] services: guix: Generate key pair if needed during activation Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 6/8] services: hurd-vm: Initialize the guest's SSH/Guix keys at activation time Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 7/8] services: hurd-vm: Pass "-no-reboot" when spawning the Hurd VM Ludovic Courtès
2020-09-27 15:32 ` [bug#43650] [PATCH 8/8] secret-service: Add a timeout when waiting for a client Ludovic Courtès
2020-09-28 16:57 ` [bug#43650] [PATCH 1/8] services: hurd-vm: Run QEMU as an unprivileged user Jan Nieuwenhuizen
2020-09-28 22:19 ` Ludovic Courtès
2020-09-29 7:06 ` Efraim Flashner
2020-09-29 10:23 ` Ludovic Courtès
2020-09-28 17:10 ` [bug#43650] [PATCH 0/8] Assorted childhurd improvements Jan Nieuwenhuizen
2020-09-28 20:47 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200927153221.9154-3-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=43650@debbugs.gnu.org \
--cc=janneke@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).