From: wessels <>
Date: Fri, 16 May 1997 13:44:57 +0000 (+0000)
Subject: log swap_file_number in store.log
X-Git-Tag: SQUID_3_0_PRE1~4992
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2abe48223425245403e32f4bcad2243c20817432;p=thirdparty%2Fsquid.git

log swap_file_number in store.log
---

diff --git a/src/store.cc b/src/store.cc
index a9d2654c91..54ccc4bf15 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.235 1997/05/16 00:19:30 wessels Exp $
+ * $Id: store.cc,v 1.236 1997/05/16 07:44:57 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -502,10 +502,11 @@ storeLog(int tag, const StoreEntry * e)
     if (mem == NULL)
 	return;
     reply = mem->reply;
-    sprintf(logmsg, "%9d.%03d %-7s %4d %9d %9d %9d %s %d/%d %s %s\n",
+    sprintf(logmsg, "%9d.%03d %-7s %08X %4d %9d %9d %9d %s %d/%d %s %s\n",
 	(int) current_time.tv_sec,
 	(int) current_time.tv_usec / 1000,
 	storeLogTags[tag],
+	e->swap_file_number,
 	reply->code,
 	(int) reply->date,
 	(int) reply->last_modified,
@@ -1092,6 +1093,10 @@ storeSwapInStart(StoreEntry * e, SIH * callback, void *callback_data)
 	callback(callback_data, 0);
 	return;
     }
+    if (e->store_status == STORE_PENDING) {
+	callback(callback_data, 0);
+	return;
+    }
     assert(e->swap_status == SWAP_OK);
     assert(e->swap_file_number >= 0);
     assert(e->mem_obj == NULL);
@@ -1797,7 +1802,7 @@ storePurgeOld(void *unused)
     for (e = storeGetFirst(); e; e = storeGetNext()) {
 	if ((++n & 0xFF) == 0) {
 	    getCurrentTime();
-	    if (shutdown_pending || reread_pending)
+	    if (shutdown_pending || reconfigure_pending)
 		break;
 	}
 	if ((n & 0xFFF) == 0)