[packages/varnish/VARNISH_2_0: 3/9] - drop varnishlog initscript; it is pointless to capture all the log all the times

[glen]

commit b8084133312f5b8ecfa1ed80b598487814bb8e4a
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed May 26 14:17:11 2010 +0000

    - drop varnishlog initscript; it is pointless to capture all the log all the times
    
    Changed files:
        varnish.spec -> 1.57
        varnishlog.init -> 1.7

 varnish.spec    |   7 +---
 varnishlog.init | 112 --------------------------------------------------------
 2 files changed, 1 insertion(+), 118 deletions(-)
---
diff --git a/varnish.spec b/varnish.spec
index bc0bc98..0038a9b 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,5 +1,6 @@
 # TODO
 # - make tests use secure dir, not /tmp, see varnish-2.0.6/bin/varnishtest
+# - hungs ac builders: tests/a00009.vtc
 # - some -l missing: /usr/lib64/libvcl.so.1.0.0
 #
 # Conditional build:
@@ -129,7 +130,6 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{logrotate.d,rc.d/init.d,sysconfi
 	$RPM_BUILD_ROOT/var/log/{archive/,}varnish
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnish
-install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnishlog
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnishncsa
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/varnish
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/varnishncsa
@@ -141,10 +141,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add varnish
-/sbin/chkconfig --add varnishlog
 /sbin/chkconfig --add varnishncsa
 %service varnish restart
-%service varnishlog restart
 %service varnishncsa restart
 
 %pre
@@ -160,10 +158,8 @@ fi
 %preun
 if [ "$1" = "0" ]; then
 	%service -q varnish stop
-	%service -q varnishlog stop
 	%service -q varnishncsa stop
 	/sbin/chkconfig --del varnish
-	/sbin/chkconfig --del varnishlog
 	/sbin/chkconfig --del varnishncsa
 fi
 
@@ -179,7 +175,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/varnishncsa
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/varnish
 %attr(754,root,root) /etc/rc.d/init.d/varnish
-%attr(754,root,root) /etc/rc.d/init.d/varnishlog
 %attr(754,root,root) /etc/rc.d/init.d/varnishncsa
 %attr(755,root,root) %{_sbindir}/varnishd
 %attr(755,root,root) %{_bindir}/varnish*
diff --git a/varnishlog.init b/varnishlog.init
deleted file mode 100644
index 443de0d..0000000
--- a/varnishlog.init
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-# varnishlog	Control the varnish logging daemon
-#
-# chkconfig:	345 90 10
-#
-# description:	Varnish HTTP accelerator logging daemon
-#
-# processname:	varnishlog
-# pidfile: /var/run/varnish/varnishlog.pid
-#
-# $Id$
-
-# Source function library
-. /etc/rc.d/init.d/functions
-
-# Get service config - may override defaults
-[ -f /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
-
-pidfile="/var/run/varnishlog.pid"
-logfile="/var/log/varnish/varnish.log"
-
-start() {
-	# Check if the service is already running?
-	if [ -f /var/lock/subsys/varnishlog ]; then
-		msg_already_running "Varnish logging daemon"
-		return
-	fi
-
-	msg_starting "Varnish logging daemon"
-	daemon --pidfile $pidfile /usr/bin/varnishlog -a -w $logfile -D -P $pidfile
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/varnishlog
-}
-
-stop() {
-	if [ ! -f /var/lock/subsys/varnishlog ]; then
-		msg_not_running "Varnish logging daemon"
-		return
-	fi
-
-	# Stop daemons.
-	msg_stopping "Varnish logging daemon"
-	killproc --pidfile $pidfile varnishlog
-	rm -f /var/lock/subsys/varnishlog
-}
-
-condrestart() {
-	if [ ! -f /var/lock/subsys/varnishlog ]; then
-		msg_not_running "Varnish logging daemon"
-		RETVAL=$1
-		return
-	fi
-
-	stop
-	start
-}
-
-reload() {
-	if [ ! -f /var/lock/subsys/varnishlog ]; then
-		msg_not_running "Varnish logging daemon"
-		RETVAL=7
-		return
-	fi
-
-	msg_reloading "Varnish logging daemon"
-	killproc --pidfile $pidfile varnishlog -HUP
-}
-
-flush-logs() {
-	if [ ! -f /var/lock/subsys/varnishncsa ]; then
-		msg_not_running "Varnish logging daemon"
-		return
-	fi
-
-	show "Rotating %s logs" "Varnish logging daemon"
-	killproc --pidfile $pidfile varnishlog -HUP
-	RETVAL=$?
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart)
-	stop
-	start
-	;;
-  try-restart)
-	condrestart 0
-	;;
-  reload|force-reload)
-	reload
-	;;
-  flush-logs)
-	flush-logs
-	;;
-  status)
-	status varnishlog
-	RETVAL=$?
-	;;
-  *)
-	msg_usage "$0 {start|stop|restart|try-restart|force-reload|flush-logs|status}"
-	exit 3
-esac
-
-exit $RETVAL
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/varnish.git/commitdiff/1da6da99515f74135181c120aebdf3d517671c02