Revert changes to debug

squid-cache · Aug 9, 2024 · 9bb3ed0 · 9bb3ed0
1 parent 78d2448
commit 9bb3ed0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/src/acl/external/time_quota/ext_time_quota_acl.cc b/src/acl/external/time_quota/ext_time_quota_acl.cc
@@ -341,7 +341,6 @@ int main(int argc, char **argv)
 
     program_name = argv[0];
     Debug::NameThisHelper("ext_time_quota_acl");
-    char *cacheLog = nullptr;
 
     while ((opt = getopt(argc, argv, "dp:b:h")) != -1) {
         switch (opt) {
@@ -366,15 +365,8 @@ int main(int argc, char **argv)
         }
     }
 
-    if (cacheLog) {
-        Debug::cache_log = cacheLog;
-        Debug::doNotCloseOnExec = true;
-        Debug::UseCacheLog();
-        Debug::ResetStderrLevel(DBG_CRITICAL); // stop debugging to stderr
-        // debug levels are reset by UseCacheLog
-        if (debug)
-            Debug::Levels[MY_DEBUG_SECTION] = DBG_DATA;
-    }
+    if (debug)
+        Debug::Levels[MY_DEBUG_SECTION] = DBG_DATA;
 
     debugs(MY_DEBUG_SECTION, DBG_IMPORTANT, "Starting " << program_name);
     setbuf(stdout, nullptr);

diff --git a/src/debug/Stream.h b/src/debug/Stream.h
@@ -83,7 +83,6 @@ class Debug
     static int Levels[MAX_DEBUG_SECTIONS];
     static int override_X;
     static bool log_syslog;
-    static bool doNotCloseOnExec;
 
     // TODO: Convert all helpers to use debugs() and NameThisHelper() APIs.
     /// Use the given name for debugs() messages from this helper process.

diff --git a/src/debug/debug.cc b/src/debug/debug.cc
@@ -27,7 +27,6 @@
 char *Debug::debugOptions = nullptr;
 int Debug::override_X = 0;
 bool Debug::log_syslog = false;
-bool Debug::doNotCloseOnExec = false;
 int Debug::Levels[MAX_DEBUG_SECTIONS];
 char *Debug::cache_log = nullptr;
 int Debug::rotateNumber = -1;
@@ -765,8 +764,7 @@ DebugFile::reset(FILE *newFile, const char *newName)
     file_ = newFile; // may be nil
 
     if (file_) {
-        if (!Debug::doNotCloseOnExec)
-            commSetCloseOnExec(fileno(file_));
+        commSetCloseOnExec(fileno(file_));
         fd_open(fileno(file_), FD_LOG, Debug::cache_log);
     }