From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 54986@debbugs.gnu.org
Cc: ludo@gnu.org
Subject: [bug#54986] [PATCH v2 3/3 WIP] services: mpd: Support socket activation.
Date: Sat, 23 Apr 2022 16:39:59 +0200 [thread overview]
Message-ID: <155723efbcf08c6e0bb6552b8f6341d4a1f20ecb.camel@gmail.com> (raw)
In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com>
* gnu/services/audio.scm (<mpd-configuration>)[shepherd-endpoints]: New field.
(mpd-shepherd-service): Use it.
* doc/guix.texi (Music Player Daemon): Document it.
---
doc/guix.texi | 7 +++++++
gnu/services/audio.scm | 45 ++++++++++++++++++++++++++++++------------
2 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 38aeda1d2d..6bfa854b1d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -30883,6 +30883,13 @@ The port to run mpd on.
The address that mpd will bind to. To use a Unix domain socket,
an absolute path can be specified here.
+@item @code{shepherd-endpoints} (default: @code{'()})
+The endpoints shepherd shall bind and spawn MPD from. If this field is
+not empty (checked via @code{null?}), a systemd-style service is used
+rather than a forkexec-service. This delays the start of MPD until the
+first client connects. As a side effect @code{port} and @code{address}
+may be ignored.
+
@item @code{outputs} (default: @code{"(list (mpd-output))"})
The audio outputs that MPD can use. By default this is a single output using pulseaudio.
diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm
index c60053f33c..b184ac596a 100644
--- a/gnu/services/audio.scm
+++ b/gnu/services/audio.scm
@@ -78,6 +78,8 @@ (define-record-type* <mpd-configuration>
(default "6600"))
(address mpd-configuration-address
(default "any"))
+ (shepherd-endpoints mpd-configuration-shepherd-endpoints
+ (default '())) ; list of <shepherd-endpoint>
(outputs mpd-configuration-outputs
(default (list (mpd-output)))))
@@ -140,19 +142,36 @@ (define (mpd-shepherd-service config)
(documentation "Run the MPD (Music Player Daemon)")
(requirement '(user-processes))
(provision '(mpd))
- (start #~(make-forkexec-constructor
- (list #$(file-append mpd "/bin/mpd")
- "--no-daemon"
- #$(mpd-config->file config))
- #:environment-variables
- ;; Required to detect PulseAudio when run under a user account.
- (list (string-append
- "XDG_RUNTIME_DIR=/run/user/"
- (number->string
- (passwd:uid
- (getpwnam #$(mpd-configuration-user config))))))
- #:log-file #$(mpd-file-name config "log")))
- (stop #~(make-kill-destructor))))
+ (start (if (null? (mpd-configuration-shepherd-endpoints config))
+ #~(make-forkexec-constructor
+ (list #$(file-append mpd "/bin/mpd")
+ "--no-daemon"
+ #$(mpd-config->file config))
+ #:environment-variables
+ ;; Required to detect PulseAudio when run under a user account.
+ (list (string-append
+ "XDG_RUNTIME_DIR=/run/user/"
+ (number->string
+ (passwd:uid
+ (getpwnam #$(mpd-configuration-user config))))))
+ #:log-file #$(mpd-file-name config "log"))
+ #~(make-systemd-constructor
+ (list #$(file-append mpd "/bin/mpd")
+ "--systemd"
+ #$(mpd-config->file config))
+ (list #$@(map shepherd-endpoint->sexp
+ (mpd-configuration-shepherd-endpoints config)))
+ #:environment-variables
+ ;; Required to detect PulseAudio when run under a user account.
+ (list (string-append
+ "XDG_RUNTIME_DIR=/run/user/"
+ (number->string
+ (passwd:uid
+ (getpwnam #$(mpd-configuration-user config))))))
+ #:log-file #$(mpd-file-name config "log"))))
+ (stop (if (null? (mpd-configuration-shepherd-endpoints config))
+ #~(make-kill-destructor)
+ #~(make-systemd-destructor)))))
(define (mpd-service-activation config)
(with-imported-modules '((guix build utils))
--
2.35.1
next prev parent reply other threads:[~2022-04-23 17:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-17 10:01 [bug#54986] [PATCH] gnu: mpd: Add support for socket activation Liliana Marie Prikler
2022-04-17 10:01 ` [bug#54986] [PATCH v2 1/3] " Liliana Marie Prikler
2022-04-17 21:06 ` [bug#54986] [PATCH] " Ludovic Courtès
2022-04-17 21:57 ` Liliana Marie Prikler
2022-04-18 21:05 ` Ludovic Courtès
2022-04-18 21:19 ` Liliana Marie Prikler
2022-04-27 20:56 ` Ludovic Courtès
2022-04-28 16:45 ` Liliana Marie Prikler
2022-04-23 14:25 ` [bug#54986] [PATCH v3 1/2] services: shepherd: Add support for socket activation endpoints Liliana Marie Prikler
2023-04-26 0:33 ` [bug#54986] [PATCH] gnu: mpd: Add support for socket activation Maxim Cournoyer
2023-04-26 4:28 ` Liliana Marie Prikler
2023-05-01 15:53 ` Maxim Cournoyer
2023-05-01 16:09 ` Liliana Marie Prikler
2023-05-03 3:17 ` Maxim Cournoyer
2023-05-03 13:27 ` Ludovic Courtès
2023-05-03 16:54 ` Liliana Marie Prikler
2023-05-10 15:14 ` Ludovic Courtès
2023-05-10 18:32 ` Liliana Marie Prikler
2023-05-11 10:52 ` Ludovic Courtès
2022-04-23 14:25 ` [bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socket activation endpoints Liliana Marie Prikler
2022-04-27 22:05 ` Ludovic Courtès
2022-04-23 14:39 ` [bug#54986] [PATCH v3 2/2] services: mpd: Support socket activation Liliana Marie Prikler
2022-10-23 11:38 ` Liliana Marie Prikler
2022-11-26 12:59 ` Liliana Marie Prikler
2022-04-23 14:39 ` Liliana Marie Prikler [this message]
2022-04-23 17:31 ` [bug#54986] [PATCH v2 3/3 WIP] " Maxime Devos
2022-04-23 18:36 ` Liliana Marie Prikler
2022-04-23 17:35 ` Maxime Devos
2022-04-23 18:28 ` Liliana Marie Prikler
2022-04-27 22:08 ` Ludovic Courtès
2022-05-13 15:55 ` [bug#54986] [PATCH] gnu: mpd: Add support for " Ludovic Courtès
2022-05-13 17:00 ` Liliana Marie Prikler
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=155723efbcf08c6e0bb6552b8f6341d4a1f20ecb.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=54986@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 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).