[shepherd] 24/24: shepherd: Gracefully handle failure to open the socket.

[Ludovic Courtès]

civodul pushed a commit to branch wip-fibers
in repository shepherd.

commit 8664372dff85059c8958bc112e91ce29e3dabe67
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Mar 28 23:10:03 2022 +0200

    shepherd: Gracefully handle failure to open the socket.
    
    Previously 'shepherd' would just show a backtrace and hang because other
    fibers would still be running.
    
    * modules/shepherd.scm (call-with-server-socket): Catch 'system-error'
    around 'open-server-socket' call.
---
 modules/shepherd.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/shepherd.scm b/modules/shepherd.scm
index 63a0a2c..80ce642 100644
--- a/modules/shepherd.scm
+++ b/modules/shepherd.scm
@@ -72,7 +72,18 @@ delimited continuations and fibers."
 (define (call-with-server-socket file-name proc)
   "Call PROC, passing it a listening socket at FILE-NAME and deleting the
 socket file at FILE-NAME upon exit of PROC.  Return the values of PROC."
-  (let ((sock (open-server-socket file-name)))
+  (let ((sock (catch 'system-error
+                (lambda ()
+                  (open-server-socket file-name))
+                (lambda args
+                  (match args
+                    ((key proc . _)
+                     (report-error (l10n "while opening socket '~a': ~a: ~a~%")
+                                   file-name proc
+                                   (strerror (system-error-errno args)))
+                     ;; Stop services that were started from the config file
+                     ;; and quit.
+                     (stop 'root)))))))
     (unwind-protect (proc sock)
                     (begin
                       (close sock)