From: wessels <>
Date: Fri, 13 Apr 2007 01:37:23 +0000 (+0000)
Subject: Comment out some debugging messages that are printed before cache_log
X-Git-Tag: SQUID_3_0_PRE6~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af00d03d5fea65f52ba6af1317e048e3707e9034;p=thirdparty%2Fsquid.git

Comment out some debugging messages that are printed before cache_log
is initialized because we see them on stderr for commands like
squid -k reconfigure.
---

diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
index bd34d0c59a..a0aad76a16 100644
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DiskDaemonDiskIOModule.cc,v 1.3 2006/05/29 00:15:03 robertc Exp $
+ * $Id: DiskDaemonDiskIOModule.cc,v 1.4 2007/04/12 19:37:24 wessels Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -59,7 +59,15 @@ DiskDaemonDiskIOModule::init()
      */
     assert(!initialised);
     memset(&diskd_stats, '\0', sizeof(diskd_stats));
+#if 0
+    /*
+     * DPW 2007-04-12
+     * No debugging here please because this method is called before
+     * the debug log is configured and we'll get the message on
+     * stderr when doing things like 'squid -k reconfigure'
+     */
     debugs(47, 1, "diskd started");
+#endif
     initialised = true;
 }
 
diff --git a/src/mem.cc b/src/mem.cc
index 1b4ec8bf88..f698caaebc 100644
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.101 2006/09/03 21:05:20 hno Exp $
+ * $Id: mem.cc,v 1.102 2007/04/12 19:37:23 wessels Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -354,8 +354,16 @@ memConfigure(void)
     else
         new_pool_limit = mem_unlimited_size;
 
+#if 0
+    /*
+     * DPW 2007-04-12
+     * No debugging here please because this method is called before
+     * the debug log is configured and we'll get the message on
+     * stderr when doing things like 'squid -k reconfigure'
+     */
     if (MemPools::GetInstance().idleLimit() > new_pool_limit)
         debug(13, 1) ("Shrinking idle mem pools to %.2f MB\n", toMB(new_pool_limit));
+#endif
 
     MemPools::GetInstance().setIdleLimit(new_pool_limit);
 }