From: wessels <>
Date: Tue, 16 Apr 1996 22:37:53 +0000 (+0000)
Subject: update
X-Git-Tag: SQUID_3_0_PRE1~6151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d6600c365aad64b74d561e8b31f421da4ee6c1c;p=thirdparty%2Fsquid.git

update
---

diff --git a/scripts/RunAccel.in b/scripts/RunAccel.in
index 5744f8df2e..15a88080a4 100644
--- a/scripts/RunAccel.in
+++ b/scripts/RunAccel.in
@@ -1,131 +1,33 @@
-#!/bin/csh -f
-
-# Set this to be the port of your HTTPD accelerator
-set HTTPD_ACCEL_PORT = 80
-#
-#  RunAccel - runs cached as an HTTPD accelerator.  whenever it exits, 
-#             it restarts.  Must compile cached *without* the -DDAEMON flag.
-#
-#  Usage: RunAccel [cachedir]
-#
-#  Darren Hardy, University of Colorado - Boulder, August 1994
+#!/bin/sh
 #
-#  $Id: RunAccel.in,v 1.1 1996/02/22 06:23:57 wessels Exp $
-#
-#######################################################################
-#
-#  Copyright (c) 1994, 1995.  All rights reserved.
-#  
-#    The Harvest software was developed by the Internet Research Task
-#    Force Research Group on Resource Discovery (IRTF-RD):
-#  
-#          Mic Bowman of Transarc Corporation.
-#          Peter Danzig of the University of Southern California.
-#          Darren R. Hardy of the University of Colorado at Boulder.
-#          Udi Manber of the University of Arizona.
-#          Michael F. Schwartz of the University of Colorado at Boulder.
-#          Duane Wessels of the University of Colorado at Boulder.
-#  
-#    This copyright notice applies to software in the Harvest
-#    ``src/'' directory only.  Users should consult the individual
-#    copyright notices in the ``components/'' subdirectories for
-#    copyright information about other software bundled with the
-#    Harvest source code distribution.
-#  
-#  TERMS OF USE
-#    
-#    The Harvest software may be used and re-distributed without
-#    charge, provided that the software origin and research team are
-#    cited in any use of the system.  Most commonly this is
-#    accomplished by including a link to the Harvest Home Page
-#    (http://harvest.cs.colorado.edu/) from the query page of any
-#    Broker you deploy, as well as in the query result pages.  These
-#    links are generated automatically by the standard Broker
-#    software distribution.
-#    
-#    The Harvest software is provided ``as is'', without express or
-#    implied warranty, and with no support nor obligation to assist
-#    in its use, correction, modification or enhancement.  We assume
-#    no liability with respect to the infringement of copyrights,
-#    trade secrets, or any patents, and are not responsible for
-#    consequential damages.  Proper use of the Harvest software is
-#    entirely the responsibility of the user.
-#  
-#  DERIVATIVE WORKS
-#  
-#    Users may make derivative works from the Harvest software, subject 
-#    to the following constraints:
-#  
-#      - You must include the above copyright notice and these 
-#        accompanying paragraphs in all forms of derivative works, 
-#        and any documentation and other materials related to such 
-#        distribution and use acknowledge that the software was 
-#        developed at the above institutions.
-#  
-#      - You must notify IRTF-RD regarding your distribution of 
-#        the derivative work.
-#  
-#      - You must clearly notify users that your are distributing 
-#        a modified version and not the original Harvest software.
-#  
-#      - Any derivative product is also subject to these copyright 
-#        and use restrictions.
-#  
-#    Note that the Harvest software is NOT in the public domain.  We
-#    retain copyright, as specified above.
-#  
-#  HISTORY OF FREE SOFTWARE STATUS
-#  
-#    Originally we required sites to license the software in cases
-#    where they were going to build commercial products/services
-#    around Harvest.  In June 1995 we changed this policy.  We now
-#    allow people to use the core Harvest software (the code found in
-#    the Harvest ``src/'' directory) for free.  We made this change
-#    in the interest of encouraging the widest possible deployment of
-#    the technology.  The Harvest software is really a reference
-#    implementation of a set of protocols and formats, some of which
-#    we intend to standardize.  We encourage commercial
-#    re-implementations of code complying to this set of standards.  
-#  
-#
-if ($?HARVEST_HOME == 0) then
-	setenv HARVEST_HOME @INSTALL_TOPDIR@
-endif
-
-limit coredumpsize unlimited >&/dev/null
-
-set path = ($HARVEST_HOME/bin $HARVEST_HOME/lib $path)
-
-if ($#argv == 1) then
-	set cachedir = "$1"
-else
-	set cachedir = `grep ^cache_dir /etc/cached.conf | awk '{print $2}'`
-	if ($?status != 0) then
-		set cachedir = "/tmp/cache"
-	endif
-endif
-
-@ failcount = 0
-
-while (1) 
-	mkdir $cachedir >& /dev/null
-	cd $cachedir
-
-        set start=`date '+%d%H%M%S'`
-
-	cached -z -a $HTTPD_ACCEL_PORT >>& cached.out
-
-        set stop=`date '+%d%H%M%S'`
-        @ t = $stop - $start
-        if ( 0 <= $t && $t < 5 ) then
-                @ failcount = $failcount + 1
-        else
-                @ failcount = 0
-        endif
-        if ( $failcount > 5 ) then
-                echo "RunAccel: EXITING DUE TO REPEATED, FREQUENT FAILURES"
-                exit 1
-        endif
-
+#  $Id: RunAccel.in,v 1.2 1996/04/16 16:37:53 wessels Exp $
+
+# enable HTTP requests on port 80
+set port="-a 80"
+
+PATH=@prefix@/bin:/bin
+export PATH
+
+if test $#argv = 1 ; then
+	conf="-f $1"
+	shift;
+fi
+
+failcount=0
+while test 1 ; do
+	echo "Running: squid $port -s $conf >> squid.out 2>&1"
+	start=`date '+%d%H%M%S'`
+	squid $port -s $conf >> 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"
+		exit 1
+	fi
 	sleep 10
-end
+done