From: hno <>
Date: Wed, 3 May 2000 01:43:30 +0000 (+0000)
Subject: hno squid-2.3.DEVEL2.cache_swap_log_name-2.patch
X-Git-Tag: SQUID_3_0_PRE1~2022
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a80e50c703cf20a608a92b7ef14188392df58f85;p=thirdparty%2Fsquid.git

hno squid-2.3.DEVEL2.cache_swap_log_name-2.patch
Squid-2.3.DEVEL2: cache_swap_log name based on cache_dir name

%s can now be used in cache_swap_log to build a log file name based on
the cache_dir name instead of numbering the files according to their
corresponding cache_dir location in squid.conf. This is very useful if
you'd like to be able to add or remove cache directories while using
cache_swap_log to have the index files stored outside the cache
directories.
---

diff --git a/ChangeLog b/ChangeLog
index 140bc0eca1..6a6c566634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@ Changes to Squid-2.4.DEVEL3 ():
 	- Async-IO on linux now makes proper use of mutexes. This fixes some
 	  odd pthread segfaults on SMP Linux machines, at a slight performance
 	  penalty.
+	- %s can now be used in cache_swap_log and will be substituded with
+	  the last path component of cache_dir.
 
 Changes to Squid-2.4.DEVEL2 ():
 
diff --git a/src/cf.data.pre b/src/cf.data.pre
index b79cf6ce86..3b83ab07e5 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.171 2000/05/02 19:35:23 hno Exp $
+# $Id: cf.data.pre,v 1.172 2000/05/02 19:43:30 hno Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -701,14 +701,19 @@ DEFAULT: none
 DOC_START
 	Location for the cache "swap.log."  This log file holds the
 	metadata of objects saved on disk.  It is used to rebuild the
-	cache during startup.  Normally this file resides in the first
+	cache during startup.  Normally this file resides in each
 	'cache_dir' directory, but you may specify an alternate
 	pathname here.  Note you must give a full filename, not just
 	a directory. Since this is the index for the whole object
 	list you CANNOT periodically rotate it!
 
-	If you have more than one 'cache_dir', these swap logs will
-	have names such as:
+	If %s can be used in the file name then it will be replaced with a
+	a representation of the cache_dir name where each / is replaced
+	with '.'. This is needed to allow adding/removing cache_dir
+	lines when cache_swap_log is being used.
+	    
+	If have more than one 'cache_dir', and %s is not used in the name
+	then these swap logs will have names such as:
 
 		cache_swap_log.00
 		cache_swap_log.01