[debbugs-tracker] bug#32433: closed ([PATCH] services: nginx: Get the Shepherd to respawn NGINX.)

[GNU bug Tracking System]

Your message dated Fri, 31 Aug 2018 16:38:27 +0200
with message-id <address@hidden>
and subject line Re: [bug#32433] [PATCH] services: nginx: Get the Shepherd to 
respawn NGINX.
has caused the debbugs.gnu.org bug report #32433,
regarding [PATCH] services: nginx: Get the Shepherd to respawn NGINX.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
32433: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32433
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: nginx: Get the Shepherd to respawn NGINX.
>
>
>
>
> Date: 
>
> Mon, 13 Aug 2018 23:47:50 +0200
>
>
>
>
> * 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.
> ---
>  gnu/services/web.scm | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/services/web.scm b/gnu/services/web.scm
> index 97976509b..467656444 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))
> -                         address@hidden)))))
> +                         address@hidden)
> +                 (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")))))))
>  
> -- 
> 2.18.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#32433] [PATCH] services: nginx: Get the Shepherd to respawn NGINX.
>
>
>
>
> Date: 
>
> Fri, 31 Aug 2018 16:38:27 +0200
>
>
>
>
> User-agent: 
>
> mu4e 1.0; emacs 26.1
>
>
>
>
> Clément Lassieur <address@hidden> writes:
>
> > * 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.
> > ---
> >  gnu/services/web.scm | 16 +++++++++++++++-
> >  1 file changed, 15 insertions(+), 1 deletion(-)
>
> Pushed!
>
>
> --- End Message ---