SOURCES: spamassassin-spamd-apache2.init - use killproc to shutdow...

[glen]

Author: glen                         Date: Wed Jun 13 21:00:33 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use killproc to shutdown as the httpd startup/shutdown is slow and makes restart to fail as previous instance is taking up resources and on startup the pid is not even written instantly. this should be considered as bug

---- Files affected:
SOURCES:
   spamassassin-spamd-apache2.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/spamassassin-spamd-apache2.init
diff -u SOURCES/spamassassin-spamd-apache2.init:1.2 SOURCES/spamassassin-spamd-apache2.init:1.3
--- SOURCES/spamassassin-spamd-apache2.init:1.2	Wed Jun 13 22:57:10 2007
+++ SOURCES/spamassassin-spamd-apache2.init	Wed Jun 13 23:00:28 2007
@@ -52,11 +52,7 @@
 	if [ -f /var/lock/subsys/spamd-apache2 ]; then
 		# Stop daemons.
 		msg_stopping spamd-apache2
-		if [ -n "$SA2_CONFIG" ]; then
-			$SA2_MPM -f $SA2_CONFIG -d / -k stop
-		else
-			apache-spamd.pl -k stop  --httpd-path $SA2_MPM --pidfile $SA2_PID $SA2_OPTS
-		fi
+		killproc --pidfile httpd.pid $SA2_MPM
 		rm -f /var/lock/subsys/spamd-apache2
 	else
 		msg_not_running spamd-apache2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/spamassassin-spamd-apache2.init?r1=1.2&r2=1.3&f=u