GNU bug report logs - #71950
[PATCH] services: web: Return success from nginx-action.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71950 in the body.
You can then email your comments to 71950 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tomas Volf <~@wolfsden.cz>
To: guix-patches <at> gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [PATCH] services: web: Return success from nginx-action.
Date: Fri,  5 Jul 2024 17:01:29 +0200

Previous value of #f lead to `head reload nginx' returning exit code 1,
complicating usage from scripts (and other actions).  Returning #t fixes that.
Any actual failures are still covered by the invoke call above.

* gnu/services/web.scm (nginx-shepherd-service)[nginx-action]<-s>: Return #t.

Change-Id: I4ce1645798a85baddeb0f5bd702a2567db3c7aaa
---
 gnu/services/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index b73cd30fe7..af4d6de658 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -831,7 +831,7 @@ (define (nginx-shepherd-service config)
              #~(lambda _
                  (invoke #$nginx-binary "-c" #$config-file #$@args)
                  (match '#$args
-                   (("-s" . _) #f)
+                   (("-s" . _) #t)
                    (_
                     ;; When FILE is true, we cannot be sure that PID-FILE will
                     ;; be created, so assume it won't show up.  When FILE is
-- 
2.45.1

Message #10 received at 71950-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Tomas Volf <~@wolfsden.cz>
Cc: 71950-done <at> debbugs.gnu.org
Subject: Re: [bug#71950] [PATCH] services: web: Return success from
 nginx-action.
Date: Wed, 10 Jul 2024 16:06:05 +0200

Tomas Volf <~@wolfsden.cz> skribis:

> Previous value of #f lead to `head reload nginx' returning exit code 1,
> complicating usage from scripts (and other actions).  Returning #t fixes that.
> Any actual failures are still covered by the invoke call above.
>
> * gnu/services/web.scm (nginx-shepherd-service)[nginx-action]<-s>: Return #t.
>
> Change-Id: I4ce1645798a85baddeb0f5bd702a2567db3c7aaa

Applied, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.