From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 55080@debbugs.gnu.org
Cc: ludo@gnu.org
Subject: [bug#55080] [PATCH shepherd] service: Gracefully handle non-existing log directories.
Date: Sat, 23 Apr 2022 15:11:50 +0200 [thread overview]
Message-ID: <2e5292c2d45e525aa1b8e4c495704104d4121291.camel@gmail.com> (raw)
* gnu/packages/services.scm (%service-file-logger): New variable,
implementing...
(service-file-logger): ... the old behaviour of this variable. Catch system
errors from %service-file-logger and handle them.
---
modules/shepherd/service.scm | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 013347b..567a08b 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -873,9 +873,9 @@ daemon writing FILE is running in a separate PID namespace."
(try-again)
(apply throw args)))))))
-(define (service-file-logger file input)
- "Return a thunk meant to run as a fiber that reads from INPUT and logs it to
-FILE."
+(define (%service-file-logger file input)
+ "Like 'service-file-logger', but doesn't handle the case in which FILE does
+not exist."
(let* ((fd (open-fdes file (logior O_CREAT O_WRONLY O_APPEND) #o640))
(output (fdopen fd "al")))
(set-port-encoding! output "UTF-8")
@@ -894,6 +894,19 @@ FILE."
(format output "~a~a~%" prefix line)
(loop))))))))))
+(define (service-file-logger file input)
+ "Return a thunk meant to run as a fiber that reads from INPUT and logs it to
+FILE."
+ (catch 'system-error
+ (lambda ()
+ (%service-file-logger file input))
+ (lambda args
+ (if (= ENOENT (system-error-errno args))
+ (begin
+ (mkdir-p (dirname file))
+ (%service-file-logger file input))
+ (apply throw args)))))
+
(define (service-builtin-logger command input)
"Return a thunk meant to run as a fiber that reads from INPUT and logs to
'log-output-port'."
--
2.35.1
next reply other threads:[~2022-04-23 13:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-23 13:11 Liliana Marie Prikler [this message]
2022-04-30 14:15 ` [bug#55080] [PATCH shepherd] service: Gracefully handle non-existing log directories Ludovic Courtès
2022-04-30 14:26 ` Liliana Marie Prikler
2022-05-01 13:32 ` Ludovic Courtès
2022-05-01 13:50 ` Liliana Marie Prikler
2022-08-29 15:18 ` bug#55080: " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e5292c2d45e525aa1b8e4c495704104d4121291.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=55080@debbugs.gnu.org \
--cc=ludo@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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.