From: hno <>
Date: Sun, 7 Nov 2004 21:49:44 +0000 (+0000)
Subject: Make sure the debug subsystem is suitably initialized early in the
X-Git-Tag: SQUID_3_0_PRE4~994
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3dc275d6639bed390867061f048d56db67db835d;p=thirdparty%2Fsquid.git

Make sure the debug subsystem is suitably initialized early in the
startup before configuration has been read
---

diff --git a/src/main.cc b/src/main.cc
index 2893f58571..8905914d5a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.393 2004/08/30 05:12:31 robertc Exp $
+ * $Id: main.cc,v 1.394 2004/11/07 14:49:44 hno Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -863,6 +863,7 @@ main(int argc, char **argv)
     sbrk_start = sbrk(0);
 #endif
 
+    Debug::parseOptions("ALL,1");
     debug_log = stderr;
 
     if (FD_SETSIZE < Squid_MaxFD)
diff --git a/src/tools.cc b/src/tools.cc
index 4383758a39..2926debda6 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.244 2004/10/20 22:41:05 hno Exp $
+ * $Id: tools.cc,v 1.245 2004/11/07 14:49:44 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -388,7 +388,7 @@ sigusr2_handle(int sig)
 
     if (state == 0) {
 #ifndef MEM_GEN_TRACE
-        _db_init(Config.Log.log, "ALL,10");
+        Debug::parseOptions("ALL,10");
 #else
 
         log_trace_done();
@@ -397,7 +397,7 @@ sigusr2_handle(int sig)
         state = 1;
     } else {
 #ifndef MEM_GEN_TRACE
-        _db_init(Config.Log.log, Config.debugOptions);
+        Debug::parseOptions(Config.debugOptions);
 #else
 
         log_trace_init("/tmp/squid.alloc");