Attachment 331020 Details for Bug 559534

[patch] /tmp/rclighttpd.diff, with PID_FILE parsing

rclighttpd.diff (text/plain), 2.47 KB, created by Martin Vidner on 2009-12-04 10:48:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Vidner

Created: 2009-12-04 10:48:40 UTC

Size: 2.47 KB

patch

obsolete

>--- /etc/init.d/lighttpd.orig	2009-12-03 16:38:36.000000000 +0100
>+++ /etc/init.d/lighttpd	2009-12-04 12:46:03.000000000 +0100
>@@ -128,6 +128,23 @@
> # Read config	
> . $LIGHTTPD_CONFIG
> 
>+# Parse configs to determine the pid file. Yuck.
>+ACTUAL_CONFIG="${LIGHTTPD_PARAMS##*-f }"
>+ACTUAL_CONFIG="${ACTUAL_CONFIG%% *}"
>+# echo "=$ACTUAL_CONFIG="
>+
>+get_var() {
>+  sed -n "/$1/s/^[^\"]*\"//;T;s/\".*//;p;q" $2
>+}
>+
>+S="[[:space:]]*"
>+STATE_DIR=`get_var "^var.state_dir${S}=${S}" $ACTUAL_CONFIG`
>+PID_FILE_BASE=`get_var "^server.pid-file${S}=${S}state_dir${S}+${S}" $ACTUAL_CONFIG`
>+
>+# typically /var/run/lighttpd.pid
>+PID_FILE=${STATE_DIR}${PID_FILE_BASE}
>+# echo "=$PID_FILE="
>+
> # Source LSB init functions
> # providing start_daemon, killproc, pidofproc, 
> # log_success_msg, log_failure_msg and log_warning_msg.
>@@ -175,7 +192,7 @@
> 	## Start daemon with startproc(8). If this fails
> 	## the return value is set appropriately by startproc.
> 	umask ${LIGHTTPD_UMASK:-077}
>-	startproc -e $LIGHTTPD_BIN $LIGHTTPD_PARAMS
>+	startproc -p $PID_FILE -e $LIGHTTPD_BIN $LIGHTTPD_PARAMS
> 
> 	# Remember status and be verbose
> 	rc_status -v
>@@ -185,7 +202,7 @@
> 	## Stop daemon with killproc(8) and if this fails
> 	## killproc sets the return value according to LSB.
> 
>-	killproc -TERM $LIGHTTPD_BIN
>+	killproc -TERM -p $PID_FILE $LIGHTTPD_BIN
> 
> 	# Remember status and be verbose
> 	rc_status -v
>@@ -222,7 +239,7 @@
> 
> 	echo -n "Reload service lighttpd "
> 	## if it supports it:
>-	killproc -HUP $LIGHTTPD_BIN
>+	killproc -HUP -p $PID_FILE $LIGHTTPD_BIN
> 	#touch /var/run/lighttpd.pid
> 	rc_status -v
> 
>@@ -236,7 +253,7 @@
> 
> 	# If it supports signaling:
> 	echo -n "Reload service lighttpd "
>-	killproc -HUP $LIGHTTPD_BIN
>+	killproc -HUP -p $PID_FILE $LIGHTTPD_BIN
> 	#touch /var/run/lighttpd.pid
> 	rc_status -v
> 	
>@@ -258,7 +275,7 @@
> 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
> 	
> 	# NOTE: checkproc returns LSB compliant status values.
>-	checkproc $LIGHTTPD_BIN
>+	checkproc -k -p $PID_FILE $LIGHTTPD_BIN
> 	# NOTE: rc_status knows that we called this init script with
> 	# "status" option and adapts its messages accordingly.
> 	rc_status -v
>@@ -268,7 +285,7 @@
> 	## argument to this init script which is required for a reload.
> 	## Note: probe is not (yet) part of LSB (as of 1.9)
> 
>-	test /etc/lighttpd/lighttpd.conf -nt /var/run/lighttpd.pid && echo reload
>+	test /etc/lighttpd/lighttpd.conf -nt $PID_FILE && echo reload
> 	;;
>     *)
> 	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"

Actions: View | Diff

Attachments on bug 559534: 330735 | 330736 | 330771 | 330994 | 331020 | 331050 | 331340