From: rousskov <>
Date: Thu, 2 Aug 2007 02:51:06 +0000 (+0000)
Subject: Polished ICAP debugging so that users can see fatal ICAP service failures
X-Git-Tag: SQUID_3_0_PRE7~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4932ad93f7724bc0b81677f199b3f8b84c441fcf;p=thirdparty%2Fsquid.git

Polished ICAP debugging so that users can see fatal ICAP service failures
(and not much more) at debug level 2. This may help identify why a service
is suspended.
---

diff --git a/src/ICAP/AsyncJob.cc b/src/ICAP/AsyncJob.cc
index ebe03172df..e59badb264 100644
--- a/src/ICAP/AsyncJob.cc
+++ b/src/ICAP/AsyncJob.cc
@@ -79,7 +79,7 @@ bool AsyncJob::callStart(const char *method)
 
 void AsyncJob::callException(const TextException &e)
 {
-    debugs(93, 2, typeName << "::" << inCall << " caught an exception: " <<
+    debugs(93, 3, typeName << "::" << inCall << " caught an exception: " <<
            e.message << ' ' << status());
 
     mustStop("exception");
diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc
index 3e8466b745..3fdd4be42f 100644
--- a/src/ICAP/ICAPModXact.cc
+++ b/src/ICAP/ICAPModXact.cc
@@ -420,7 +420,7 @@ void ICAPModXact::stopWriting(bool nicely)
             checkConsuming();
             return;
         }
-        debugs(93, 2, HERE << "will NOT wait for the last write" << status());
+        debugs(93, 3, HERE << "will NOT wait for the last write" << status());
 
         // Comm does not have an interface to clear the writer callback nicely,
         // but without clearing the writer we cannot recycle the connection.
@@ -589,7 +589,7 @@ void ICAPModXact::callException(const TextException &e)
     }
 
     try {
-        debugs(93, 2, "bypassing ICAPModXact::" << inCall << " exception: " <<
+        debugs(93, 3, "bypassing ICAPModXact::" << inCall << " exception: " <<
            e.message << ' ' << status());
         bypassFailure();
     }
diff --git a/src/ICAP/ICAPXaction.cc b/src/ICAP/ICAPXaction.cc
index be6f2e560b..545779f36c 100644
--- a/src/ICAP/ICAPXaction.cc
+++ b/src/ICAP/ICAPXaction.cc
@@ -207,9 +207,9 @@ void ICAPXaction::noteCommConnected(comm_err_t commStatus)
 }
 
 void ICAPXaction::dieOnConnectionFailure() {
+    debugs(93, 2, HERE << typeName <<
+        " failed to connect to " << service().uri);
     theService->noteFailure();
-    debugs(93,3, typeName << " failed to connect to the ICAP service at " <<
-        service().uri);
     throw TexcHere("cannot connect to the ICAP service");
 }
 
@@ -253,7 +253,7 @@ void ICAPXaction::noteCommTimedout()
 
 void ICAPXaction::handleCommTimedout()
 {
-    debugs(93, 2, HERE << typeName << " timeout with " <<
+    debugs(93, 2, HERE << typeName << " failed: timeout with " <<
         theService->methodStr() << " " << theService->uri.buf() << status());
     reuseConnection = false;
     service().noteFailure();