[debbugs-tracker] bug#27323: closed ([PATCH shepherd] Make sure that shepherd does not serve already-served sockets.)

[GNU bug Tracking System]

Your message dated Fri, 16 Jun 2017 10:19:40 +0200
with message-id <address@hidden>
and subject line Re: [bug#27323] [PATCH v2 shepherd 0/2] Make sure that 
shepherd does not serve already-served sockets.
has caused the debbugs.gnu.org bug report #27323,
regarding [PATCH shepherd] Make sure that shepherd does not serve 
already-served sockets.
to be marked as done.

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


-- 
27323: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=27323
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH shepherd] Make sure that shepherd does not serve already-served sockets.
>
>
>
>
> Date: 
>
> Sun, 11 Jun 2017 04:36:50 +0200
>
>
>
>
> * modules/shepherd.scm (server-present?): New variable.
> (main): Adapt.
> ---
>  modules/shepherd.scm | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/modules/shepherd.scm b/modules/shepherd.scm
> index dd8a076..4998e09 100644
> --- a/modules/shepherd.scm
> +++ b/modules/shepherd.scm
> @@ -32,10 +32,21 @@
>    #:use-module (shepherd runlevel)
>    #:use-module (shepherd args)
>    #:use-module (shepherd comm)
> +  #:use-module (rnrs io ports)
>    #:export (main))
>  
>  
>  
> +(define (server-present? file-name)
> +  "Open a socket at FILE-NAME, and connect to the server, if any.
> +Return #t if that worked."
> +  (with-fluids ((%default-port-encoding "UTF-8"))
> +    (let ((sock (socket PF_UNIX SOCK_STREAM 0)))
> +      (call-with-port sock
> +        (lambda (sock)
> +          (let ((address (make-socket-address AF_UNIX file-name)))
> +            (false-if-exception (connect sock address))))))))
> +
>  (define (open-server-socket file-name)
>    "Open a socket at FILE-NAME, and listen for connections there."
>    (with-fluids ((%default-port-encoding "UTF-8"))
> @@ -132,8 +143,12 @@
>                                               ;; we use no socket.
>                                               #f)))))))
>      ;; We do this early so that we can abort early if necessary.
> -    (and socket-file
> -         (verify-dir (dirname socket-file) #:secure? secure))
> +    (if socket-file
> +      (begin
> +         (verify-dir (dirname socket-file) #:secure? secure)
> +         (if (server-present? socket-file)
> +             (exit 0)))) ; There's already a shepherd instance running.
> +
>      ;; Enable logging as first action.
>      (start-logging logfile)
>  
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#27323] [PATCH v2 shepherd 0/2] Make sure that shepherd does not serve already-served sockets.
>
>
>
>
> Date: 
>
> Fri, 16 Jun 2017 10:19:40 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)
>
>
>
>
> Hi,
>
> Danny Milosavljevic <address@hidden> skribis:
>
> > Danny Milosavljevic (2):
> >   Use XDG_RUNTIME_DIR for the shepherd socket.
> >   Make sure that shepherd does not serve already-served sockets.
> >
> >  modules/shepherd.scm         | 1 -
> >  modules/shepherd/support.scm | 7 ++++++-
> >  2 files changed, 6 insertions(+), 2 deletions(-)
>
> Cool, applied both with a commit log and doc/test adjustments.
>
> Thanks!
>
> Ludo’.
>
>
> --- End Message ---