nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

service: shepherd: Guard against exceptions raised by 'start'. 

Fixes <http://bugs.gnu.org/22548>.
Reported by Albin <albin@fripost.org>, Mark H Weaver, and Alex Kost.

* gnu/services/shepherd.scm (shepherd-configuration-file)[config]: Guard
against 'service-error?'.
This commit is contained in:
Ludovic Courtès 2016-02-05 13:07:57 +01:00
parent 1d6b7d5847
commit 081bd3bd29
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/services/shepherd.scm
View File

@ -234,7 +234,8 @@ stored."
(set! %load-compiled-path (set! %load-compiled-path
(cons #$compiled %load-compiled-path))) (cons #$compiled %load-compiled-path)))
(use-modules (system repl error-handling)) (use-modules (srfi srfi-34)
(system repl error-handling))
;; Arrange to spawn a REPL if loading one of FILES fails. This is ;; Arrange to spawn a REPL if loading one of FILES fails. This is
;; better than a kernel panic. ;; better than a kernel panic.
@ -246,7 +247,16 @@ stored."
(setenv "PATH" "/run/current-system/profile/bin") (setenv "PATH" "/run/current-system/profile/bin")
(format #t "starting services...~%") (format #t "starting services...~%")
(for-each start (for-each (lambda (service)
;; In the Shepherd 0.3 the 'start' method can raise
;; '&action-runtime-error' if it fails, so protect
;; against it. (XXX: 'action-runtime-error?' is not
;; exported is 0.3, hence 'service-error?'.)
(guard (c ((service-error? c)
(format (current-error-port)
"failed to start service '~a'~%"
service)))
(start service)))
'#$(append-map shepherd-service-provision '#$(append-map shepherd-service-provision
(filter shepherd-service-auto-start? (filter shepherd-service-auto-start?
services))))) services)))))