Remove obsolete RunCache/RunAccel scripts.

RunCache and RunAccel have been obsolete since squid-2.6 parent/child
auto-restart feature was included in the main code.

diff --git a/configure.in b/configure.in
index 2961018875e74b947ce3262907dcbe2faf2fa98c..ff295223914349348073f225f1a8385a2ae424af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1065,9 +1065,7 @@ AC_ARG_ENABLE(kill-parent-hack,
   AS_HELP_STRING([--enable-kill-parent-hack],[Kill parent on shutdown]),
 [ if test "$enableval" = "yes" ; then
     AC_MSG_NOTICE([Kill parent on shutdown])
-    AC_DEFINE(KILL_PARENT_OPT,1,[A dangerous feature which causes Squid to kill its parent process
-    (presumably the RunCache script) upon receipt of SIGTERM or SIGINT.
-    Use with caution.])
+    AC_DEFINE(KILL_PARENT_OPT,1,[A dangerous feature which causes Squid to kill its parent process upon receipt of SIGTERM or SIGINT. Use with caution.])
   fi
 ])
 
@@ -4262,8 +4260,6 @@ AC_CONFIG_FILES([\
        compat/Makefile \
        lib/Makefile \
        scripts/Makefile \
-       scripts/RunCache \
-       scripts/RunAccel \
        src/Makefile \
        src/base/Makefile \
        src/acl/Makefile \

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7947b82c4169b32afbce2e54f0bb777185e7e6b5..427e524a06be5d73b42d211c16ffb65f15b75068 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,3 @@
-bin_SCRIPTS = RunCache RunAccel
 EXTRA_DIST     = AnnounceCache.pl access-log-matrix.pl cache-compare.pl \
                cachetrace.pl check_cache.pl convert.configure.to.os2 \
                fileno-to-pathname.pl flag_truncs.pl icp-test.pl \

diff --git a/scripts/RunAccel.in b/scripts/RunAccel.in
deleted file mode 100644 (file)
index b0674a8..0000000
--- a/scripts/RunAccel.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-#  $Id$
-
-# enable HTTP requests on port 80
-port="-a 80"
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-logdir=@localstatedir@
-PATH=@sbindir@:/bin:/usr/bin
-export PATH
-
-if test $# = 1 ; then
-       conf="-f $1"
-       shift
-fi
-
-failcount=0
-while : ; do
-       echo "Running: squid $port -s $conf >> $logdir/squid.out 2>&1"
-       start=`date '+%d%H%M%S'`
-       squid -N $port -s $conf >> $logdir/squid.out 2>&1
-       stop=`date '+%d%H%M%S'`
-       t=`expr $stop - $start`
-       if test 0 -le $t -a $t -lt 5 ; then
-               failcount=`expr $failcount + 1`
-       else
-               failcount=0
-       fi
-       if test $failcount -gt 5 ; then
-              echo "RunCache: EXITING DUE TO REPEATED, FREQUENT FAILURES" >&2
-               exit 1
-       fi
-       sleep 10
-done

diff --git a/scripts/RunCache.in b/scripts/RunCache.in
deleted file mode 100644 (file)
index 8e273d0..0000000
--- a/scripts/RunCache.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-#  $Id$
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-logdir=@localstatedir@
-PATH=@sbindir@:/bin:/usr/bin
-export PATH
-
-conf=""
-if test "$1" ; then
-       conf="-f $1"
-       shift
-fi
-
-failcount=0
-while : ; do
-       echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1"
-       echo "Startup: `date`" >> $logdir/squid.out
-       start=`date '+%d%H%M%S'`
-       squid -NsY $conf >> $logdir/squid.out 2>&1
-       stop=`date '+%d%H%M%S'`
-       t=`expr $stop - $start`
-       if test 0 -le $t -a $t -lt 5 ; then
-               failcount=`expr $failcount + 1`
-       else
-               failcount=0
-       fi
-       if test $failcount -gt 5 ; then
-              echo "RunCache: EXITING DUE TO REPEATED, FREQUENT FAILURES" >&2
-               exit 1
-       fi
-       sleep 10
-done

diff --git a/src/main.cc b/src/main.cc
index d9af2f3b88d697354cc552b4088e2e4bf2ce7a04..dcc472e2891fc2bc6b2038fa6519e117d54e38d4 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -588,7 +588,7 @@ shut_down(int sig)
 #ifdef KILL_PARENT_OPT
 
     if (getppid() > 1) {
-        debugs(1, 1, "Killing RunCache, pid " << getppid());
+        debugs(1, 1, "Killing master process, pid " << getppid());
 
         if (kill(getppid(), sig) < 0)
             debugs(1, 1, "kill " << getppid() << ": " << xstrerror());