Bug#620038: pu: package fcgiwrap/1.0-1+squeeze1

2011-04-04 Thread Philipp Kern
On Wed, Mar 30, 2011 at 02:09:36PM +0100, Adam D. Barratt wrote:
 +  * Reduce the wait when just stopping (closes: #602200).
 
 How likely is it that the daemon won't have successfully stopped within
 a second (i.e. the combination of the two sleep $QDIETIMEs calls)?

Unlikely, unless it's blocked somewhere and unkillable anyway, I think.  It
doesn't install any signal handlers for TERM, so it should go down immediately.
The wrapper is tiny and just forks off CGI processes based on FastCGI requests.
It's only 661 lines of C code after all.  ;-)

Kind regards
Philipp Kern


signature.asc
Description: Digital signature


Bug#620038: pu: package fcgiwrap/1.0-1+squeeze1

2011-04-04 Thread Adam D. Barratt
tag 620038 + pending
thanks

On Mon, 2011-04-04 at 11:08 +0200, Philipp Kern wrote:
 On Wed, Mar 30, 2011 at 02:09:36PM +0100, Adam D. Barratt wrote:
  +  * Reduce the wait when just stopping (closes: #602200).
  
  How likely is it that the daemon won't have successfully stopped within
  a second (i.e. the combination of the two sleep $QDIETIMEs calls)?
 
 Unlikely, unless it's blocked somewhere and unkillable anyway, I think.  It
 doesn't install any signal handlers for TERM, so it should go down 
 immediately.

Okay; thanks.  Flagged for accept, pending dinstall.

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620038: pu: package fcgiwrap/1.0-1+squeeze1

2011-03-30 Thread Adam D. Barratt
On Tue, 2011-03-29 at 13:54 +0200, Philipp Kern wrote:
 fcgiwrap doesn't stop properly on squeeze (#602199).  I just uploaded 1.0.3-2
 with Jordi's fixes that were pending since four months to unstable.
 
 I'd like to propose the attached fix for squeeze, too.

+fcgiwrap (1.0-1+squeeze1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * Unquote $pid and $DAEMON on stop_daemon() so it actually stops
+(closes: #602199).

I'd have been tempted to double-quote them rather than completely
removing the quoting; I suppose it's unlikely that either variable will
contain spaces or similar though.

+  * Reduce the wait when just stopping (closes: #602200).

How likely is it that the daemon won't have successfully stopped within
a second (i.e. the combination of the two sleep $QDIETIMEs calls)?

Regards,

Adam




-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620038: pu: package fcgiwrap/1.0-1+squeeze1

2011-03-30 Thread Julien Cristau
On Tue, Mar 29, 2011 at 13:54:10 +0200, Philipp Kern wrote:

 Package: release.debian.org
 User: release.debian@packages.debian.org
 Usertags: pu
 Version: 
 
 fcgiwrap doesn't stop properly on squeeze (#602199).  I just uploaded 1.0.3-2
 with Jordi's fixes that were pending since four months to unstable.
 
 I'd like to propose the attached fix for squeeze, too.

ack.

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620038: pu: package fcgiwrap/1.0-1+squeeze1

2011-03-29 Thread Philipp Kern
Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: pu
Version: 

fcgiwrap doesn't stop properly on squeeze (#602199).  I just uploaded 1.0.3-2
with Jordi's fixes that were pending since four months to unstable.

I'd like to propose the attached fix for squeeze, too.
diff -Nru fcgiwrap-1.0/debian/changelog fcgiwrap-1.0/debian/changelog
--- fcgiwrap-1.0/debian/changelog   2010-05-25 21:38:28.0 +0200
+++ fcgiwrap-1.0/debian/changelog   2011-03-29 13:49:50.0 +0200
@@ -1,3 +1,12 @@
+fcgiwrap (1.0-1+squeeze1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * Unquote $pid and $DAEMON on stop_daemon() so it actually stops
+(closes: #602199).
+  * Reduce the wait when just stopping (closes: #602200).
+
+ -- Philipp Kern pk...@debian.org  Tue, 29 Mar 2011 13:47:24 +0200
+
 fcgiwrap (1.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru fcgiwrap-1.0/debian/init fcgiwrap-1.0/debian/init
--- fcgiwrap-1.0/debian/init2010-05-25 21:35:04.0 +0200
+++ fcgiwrap-1.0/debian/init2011-03-29 13:49:20.0 +0200
@@ -39,6 +39,8 @@
 # If this value is set too low you might not
 # let some servers to die gracefully and
 # 'restart' will not work
+QDIETIME=0.5   # The same as DIETIME, but a lot shorter for the
+   # stop case.
 
 #STARTTIME=2# Time to wait for the server to start, in seconds
 # If this value is set each time the server is
@@ -49,7 +51,6 @@
 # be a false positive (says it did not start
 # when it actually did)
 
-
 # Include defaults if available
 if [ -f /etc/default/$NAME ] ; then
 . /etc/default/$NAME
@@ -137,13 +138,13 @@
 [ ! -e $PIDFILE ]  return
 PIDS=$(cat $PIDFILE)
 for pid in $PIDS; do
-  if running_pid '$pid' '$DAEMON'; then
+  if running_pid $pid $DAEMON; then
 kill -15 $pid
 # Is it really dead?
-sleep $DIETIMEs
+sleep $QDIETIMEs
 if running_pid $pid $DAEMON; then
   kill -9 $pid
-  sleep $DIETIMEs
+  sleep $QDIETIMEs
   if running_pid $pid $DAEMON; then
   echo Cannot kill $NAME (pid=$pid)!
   exit 1


signature.asc
Description: Digital signature