diff mbox series

[bug#54811,2/3] publish: Support systemd-style socket activation.

Message ID 20220409091340.7013-2-ludo@gnu.org
State Accepted
Headers show
Series Support socket activation in 'guix publish' and 'guix-daemon' | expand

Commit Message

Ludovic Courtès April 9, 2022, 9:13 a.m. UTC 
* guix/scripts/publish.scm (systemd-socket): New procedure.
(guix-publish): Add 'style' variable.  Adjust startup message depending
on whether STYLE is 'systemd.
* doc/guix.texi (Invoking guix publish): Mention socket activation.
---
 doc/guix.texi            |  5 +++++
 guix/scripts/publish.scm | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

Comments

M April 9, 2022, 9:20 a.m. UTC | #1 
Ludovic Courtès schreef op za 09-04-2022 om 11:13 [+0200]:
> +  "If this program is being spawned through systemd-style \"socket
> +activation\", whereby the listening socket is passed as file descriptor 3,
> +return the corresponding socket."

And if it isn't, what is returned then?

  "Otherwise, return #false."

Greetings,
Maxime.
Ludovic Courtès April 14, 2022, 12:51 p.m. UTC | #2 
Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> Ludovic Courtès schreef op za 09-04-2022 om 11:13 [+0200]:
>> +  "If this program is being spawned through systemd-style \"socket
>> +activation\", whereby the listening socket is passed as file descriptor 3,
>> +return the corresponding socket."
>
> And if it isn't, what is returned then?
>
>   "Otherwise, return #false."

I fixed that and pushed:

  5f74169e8e daemon: Support systemd-style socket activation.
  b9233cb9a8 publish: Support systemd-style socket activation.
  17c6d00b57 publish: Use SRFI-71 instead of SRFI-11.

Thanks,
Ludo’.
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 59db00e581..16bd858a3b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14041,6 +14041,11 @@  spawn an HTTP server on port 8080:
 guix publish
 @end example
 
+@cindex socket activation, for @command{guix publish}
+@command{guix publish} can also be started following the systemd
+``socket activation'' protocol (@pxref{Service De- and Constructors,
+@code{make-systemd-constructor},, shepherd, The GNU Shepherd Manual}).
+
 Once a publishing server has been authorized, the daemon may download
 substitutes from it.  @xref{Getting Substitutes from Other Servers}.
 
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index d6eb65d912..a4b9565f91 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -1235,6 +1235,23 @@  (define (open-server-socket address)
     (bind sock address)
     sock))
 
+(define (systemd-socket)
+  "If this program is being spawned through systemd-style \"socket
+activation\", whereby the listening socket is passed as file descriptor 3,
+return the corresponding socket."
+  (and (equal? (and=> (getenv "LISTEN_PID") string->number)
+               (getpid))
+       (match (getenv "LISTEN_FDS")
+         ((= string->number 1)
+          (let ((sock (fdopen 3 "r+0")))
+            (configure-socket sock)
+            sock))
+         ((= string->number (? integer? n))
+          (leave (G_ "~a: unexpected number of startup file descriptors")
+                 n))
+         (_
+          #f))))
+
 (define (gather-user-privileges user)
   "Switch to the identity of USER, a user name."
   (catch 'misc-error
@@ -1280,7 +1297,12 @@  (define-command (guix-publish . args)
                       (make-socket-address (sockaddr:fam addr)
                                            (sockaddr:addr addr)
                                            port)))
-           (socket  (open-server-socket address))
+           (socket style (match (systemd-socket)
+                           (#f
+                            (values (open-server-socket address)
+                                    'normal))
+                           (socket
+                            (values socket 'systemd))))
            (nar-path  (assoc-ref opts 'nar-path))
            (repl-port (assoc-ref opts 'repl))
            (cache     (assoc-ref opts 'cache))
@@ -1305,10 +1327,12 @@  (define-command (guix-publish . args)
                      (cache-bypass-threshold
                       (or (assoc-ref opts 'cache-bypass-threshold)
                           (cache-bypass-threshold))))
-        (info (G_ "publishing ~a on ~a, port ~d~%")
-              %store-directory
-              (inet-ntop (sockaddr:fam address) (sockaddr:addr address))
-              (sockaddr:port address))
+        (if (eq? style 'systemd)
+            (info (G_ "publishing (started via socket activation)~%"))
+            (info (G_ "publishing ~a on ~a, port ~d~%")
+                  %store-directory
+                  (inet-ntop (sockaddr:fam address) (sockaddr:addr address))
+                  (sockaddr:port address)))
 
         (for-each (lambda (compression)
                     (info (G_ "using '~a' compression method, level ~a~%")