GNU bug report logs - #47504
[PATCH 0/2] Have fcgiwrap log to a file.

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 47504 in the body.
You can then email your comments to 47504 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: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Have fcgiwrap log to a file.
Date: Tue, 30 Mar 2021 22:29:57 +0100

[Message part 1 (text/plain, inline)]

Christopher Baines (2):
  gnu: services: web: Cleanup whitespace.
  gnu: services: web: Have fcgiwrap log to a file.

 gnu/services/web.scm | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

[signature.asc (application/pgp-signature, inline)]

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

From: Christopher Baines <mail <at> cbaines.net>
To: 47504 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: services: web: Have fcgiwrap log to a file.
Date: Tue, 30 Mar 2021 22:34:37 +0100

This makes it easier to access the output.

* gnu/services/web.scm (fcgiwrap-shepherd-service): Pass #:log-file to
make-forkexec-constructor.
---
 gnu/services/web.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 1aad695c8b..bfcdfe7421 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -841,7 +841,8 @@ of index files."
             (start #~(make-forkexec-constructor
                       '(#$(file-append package "/sbin/fcgiwrap")
                         "-s" #$socket)
-                      #:user #$user #:group #$group))
+                      #:user #$user #:group #$group
+                      #:log-file "/var/log/fcgiwrap.log"))
             (stop #~(make-kill-destructor)))))))
 
 (define fcgiwrap-activation
-- 
2.30.1

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

From: Christopher Baines <mail <at> cbaines.net>
To: 47504 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: services: web: Cleanup whitespace.
Date: Tue, 30 Mar 2021 22:34:36 +0100

Replace tabs with spaces, and delete trailing whitespace.

* gnu/services/web.scm: Cleanup whitespace.
---
 gnu/services/web.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index aa688a4328..1aad695c8b 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -840,8 +840,8 @@ of index files."
             (requirement '(networking))
             (start #~(make-forkexec-constructor
                       '(#$(file-append package "/sbin/fcgiwrap")
-			  "-s" #$socket)
-		      #:user #$user #:group #$group))
+                        "-s" #$socket)
+                      #:user #$user #:group #$group))
             (stop #~(make-kill-destructor)))))))
 
 (define fcgiwrap-activation
@@ -863,7 +863,7 @@ of index files."
                 (extensions
                  (list (service-extension shepherd-root-service-type
                                           fcgiwrap-shepherd-service)
-		       (service-extension account-service-type
+                       (service-extension account-service-type
                                           fcgiwrap-accounts)
                        (service-extension activation-service-type
                                           fcgiwrap-activation)))
@@ -1946,24 +1946,24 @@ root=/srv/gemini
             (documentation "Run the agate Gemini server.")
             (start (let ((agate (file-append package "/bin/agate")))
                      #~(make-forkexec-constructor
-			(list #$agate
-			      "--content" #$content
-			      "--cert" #$cert
-			      "--key" #$key
-			      "--addr" #$@addr
+                        (list #$agate
+                              "--content" #$content
+                              "--cert" #$cert
+                              "--key" #$key
+                              "--addr" #$@addr
                               #$@(if lang
                                      (list "--lang" lang)
                                      '())
-			      #$@(if hostname
-				     (list "--hostname" hostname)
-				     '())
-			      #$@(if silent? '("--silent") '())
-			      #$@(if serve-secret? '("--serve-secret") '())
-			      #$@(if log-ip? '("--log-ip") '()))
-			#:user #$user #:group #$group
-			#:log-file #$log-file)))
+                              #$@(if hostname
+                                     (list "--hostname" hostname)
+                                     '())
+                              #$@(if silent? '("--silent") '())
+                              #$@(if serve-secret? '("--serve-secret") '())
+                              #$@(if log-ip? '("--log-ip") '()))
+                        #:user #$user #:group #$group
+                        #:log-file #$log-file)))
             (stop #~(make-kill-destructor)))))))
-             
+
 (define agate-accounts
   (match-lambda
     (($ <agate-configuration> _ _ _ _ _
-- 
2.30.1

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

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 47504 <at> debbugs.gnu.org
Subject: Re: [bug#47504] [PATCH 0/2] Have fcgiwrap log to a file.
Date: Wed, 31 Mar 2021 17:34:49 +0300

[Message part 1 (text/plain, inline)]

On Tue, Mar 30, 2021 at 10:29:57PM +0100, Christopher Baines wrote:
> 
> Christopher Baines (2):
>   gnu: services: web: Cleanup whitespace.
>   gnu: services: web: Have fcgiwrap log to a file.
> 
>  gnu/services/web.scm | 35 ++++++++++++++++++-----------------
>  1 file changed, 18 insertions(+), 17 deletions(-)

looks good to me. And a good excuse to remove a bunch of those pesky
tabs!

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

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

From: Christopher Baines <mail <at> cbaines.net>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 47504-done <at> debbugs.gnu.org
Subject: Re: [bug#47504] [PATCH 0/2] Have fcgiwrap log to a file.
Date: Thu, 01 Apr 2021 09:14:03 +0100

Efraim Flashner <efraim <at> flashner.co.il> writes:

> On Tue, Mar 30, 2021 at 10:29:57PM +0100, Christopher Baines wrote:
>>
>> Christopher Baines (2):
>>   gnu: services: web: Cleanup whitespace.
>>   gnu: services: web: Have fcgiwrap log to a file.
>>
>>  gnu/services/web.scm | 35 ++++++++++++++++++-----------------
>>  1 file changed, 18 insertions(+), 17 deletions(-)
>
> looks good to me. And a good excuse to remove a bunch of those pesky
> tabs!

Thanks for taking a look :) I've pushed these patches to master as of
264f7189e8fa20f4ab3da7f5e98fdd15d5eb4231.

Chris

Previous Next

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