r1246 - in branches/1.0: . redhat

[des at projects.linpro.no]

Author: des
Date: 2007-02-20 09:46:43 +0100 (Tue, 20 Feb 2007)
New Revision: 1246

Modified:
   branches/1.0/
   branches/1.0/redhat/varnish.initrc
   branches/1.0/redhat/varnish.sysconfig
Log:
 r34107 at cat (orig r1222):  ingvar | 2006-11-08 10:03:40 +0100
 Removed the usage of -w in the initscript until that bug is fixed in varnishd



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1221
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1222

Modified: branches/1.0/redhat/varnish.initrc
===================================================================
--- branches/1.0/redhat/varnish.initrc	2007-02-20 08:46:42 UTC (rev 1245)
+++ branches/1.0/redhat/varnish.initrc	2007-02-20 08:46:43 UTC (rev 1246)
@@ -21,9 +21,11 @@
 		-f ${VARNISH_VCL_CONF} \
 		-T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
 		-t ${VARNISH_TTL} \
-		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
 		-s ${VARNISH_BACKEND_STORAGE}"	
 
+# Note: The set of working threads is temporary broken in varnish-1.0.2.
+# This will be fixed in an upcoming release
+#		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
 
 mkdir -p /var/run/varnish 2>/dev/null
 

Modified: branches/1.0/redhat/varnish.sysconfig
===================================================================
--- branches/1.0/redhat/varnish.sysconfig	2007-02-20 08:46:42 UTC (rev 1245)
+++ branches/1.0/redhat/varnish.sysconfig	2007-02-20 08:46:43 UTC (rev 1246)
@@ -20,6 +20,9 @@
 VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
 VARNISH_ADMIN_LISTEN_PORT=6082
 
+# Note: The working set of threads is temporary broken in 
+# varnish-1.0.2. The following 3  entries will not be used.
+# This will be fixed in an upcoming release
 
 # The minimum number of threads to start
 VARNISH_MIN_WORKER_THREADS=1