summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2018-08-13 21:05:55 +0200
committerClément Lassieur <clement@lassieur.org>2018-08-31 16:35:39 +0200
commit9fc2922794ffaae48e0a7c536e530ea2e0d46cf3 (patch)
tree3db67934a84cf500bc4db099f15dd153b87cf44b
parent0b6678cd441006d5cd65a8aa33f17458b3588a19 (diff)
services: nginx: Get the Shepherd to respawn NGINX.
* gnu/services/web.scm (nginx-shepherd-service): Change 'start' (that is, all actions that don't send a signal to the master process) to return the PID. Wait until the PID file is created and contains an integer because it might be created after the parent process exits.
-rw-r--r--gnu/services/web.scm16
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 97976509b6..467656444e 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -599,19 +599,33 @@ of index files."
<nginx-configuration>
(nginx file run-directory)
(let* ((nginx-binary (file-append nginx "/sbin/nginx"))
+ (pid-file (in-vicinity run-directory "pid"))
(nginx-action
(lambda args
#~(lambda _
(invoke #$nginx-binary "-c"
#$(or file
(default-nginx-config config))
- #$@args)))))
+ #$@args)
+ (match '#$args
+ (("-s" . _) #t)
+ (_
+ (let loop ((duration 0))
+ ;; https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864/comments/7
+ (sleep duration)
+ (if (file-exists? #$pid-file)
+ (let ((pid (call-with-input-file #$pid-file read)))
+ ;; it could be #<eof>
+ (if (integer? pid) pid (loop 1)))
+ (loop 1)))))))))
;; TODO: Add 'reload' action.
(list (shepherd-service
(provision '(nginx))
(documentation "Run the nginx daemon.")
(requirement '(user-processes loopback))
+ (modules `((ice-9 match)
+ ,@%default-modules))
(start (nginx-action "-p" run-directory))
(stop (nginx-action "-s" "stop")))))))