lessen debugging for internal dns

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 76b51399c3d43789241b8f6dd783e8a9b68c74f6..fa3693578a2b400187302ed68d016916728baa78 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.9 1999/04/19 04:45:03 wessels Exp $
+ * $Id: dns_internal.cc,v 1.10 1999/04/19 05:13:41 wessels Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -250,7 +250,7 @@ idnsGrokReply(const char *buf, size_t sz)
     }
     q = idnsFindQuery(rid);
     if (q == NULL) {
-       debug(78, 1) ("idnsGrokReply: Didn't find query!\n");
+       debug(78, 3) ("idnsGrokReply: Late response\n");
        rfc1035RRDestroy(answers, n);
        return;
     }
@@ -324,15 +324,16 @@ idnsCheckQueue(void *unused)
        q = n->data;
        if (tvSubDsec(q->sent_t, current_time) < 5.0)
            break;
-       debug(78, 1) ("idnsCheckQueue: ID %#04x timeout\n",
+       debug(78, 3) ("idnsCheckQueue: ID %#04x timeout\n",
            q->id);
        dlinkDelete(&q->lru, &lru_list);
        if (q->nsends < IDNS_MAX_TRIES) {
            idnsSendQuery(q);
        } else {
            int v = cbdataValid(q->callback_data);
-           debug(78, 1) ("idnsCheckQueue: ID %x: giving up after %d tries\n",
-               (int) q->id, q->nsends);
+           debug(78, 1) ("idnsCheckQueue: ID %x: giving up after %d tries and %5.1f seconds\n",
+               (int) q->id, q->nsends,
+               tvSubDsec(q->start_t, current_time));
            cbdataUnlock(q->callback_data);
            if (v)
                q->callback(q->callback_data, NULL, 0);

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 8e5bf9b97d85a25b435ee212c359115a06b675d3..d376cf6b7c0e38963fa0ffbc76cfe1c4c1397a9a 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: fqdncache.cc,v 1.128 1999/04/18 05:28:52 wessels Exp $
+ * $Id: fqdncache.cc,v 1.129 1999/04/19 05:15:55 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -225,8 +225,8 @@ fqdncache_call_pending(fqdncache_entry * f)
     fqdncacheUnlockEntry(f);
 }
 
-#if USE_DNSSERVERS
 static fqdncache_entry *
+#if USE_DNSSERVERS
 fqdncacheParse(const char *inbuf)
 {
     LOCAL_ARRAY(char, buf, DNS_INBUF_SZ);
@@ -277,7 +277,6 @@ fqdncacheParse(const char *inbuf)
     return &f;
 }
 #else
-static fqdncache_entry *
 fqdncacheParse(rfc1035_rr * answers, int nr)
 {
     static fqdncache_entry f;
@@ -288,14 +287,14 @@ fqdncacheParse(rfc1035_rr * answers, int nr)
     f.expires = squid_curtime;
     f.status = FQDN_NEGATIVE_CACHED;
     if (nr < 0) {
-       debug(35, 1) ("fqdncacheParse: Lookup failed (error %d)\n",
+       debug(35, 3) ("fqdncacheParse: Lookup failed (error %d)\n",
            rfc1035_errno);
        assert(rfc1035_error_message);
        f.error_message = xstrdup(rfc1035_error_message);
        return &f;
     }
     if (nr == 0) {
-       debug(35, 1) ("fqdncacheParse: No DNS records\n");
+       debug(35, 3) ("fqdncacheParse: No DNS records\n");
        f.error_message = xstrdup("No DNS records");
        return &f;
     }

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 252c095cd7a254e586d918432734ee39cfe62239..14bcf21b9cd6cf612f5801a8e57d08e626b9e825 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.214 1999/04/19 05:13:41 wessels Exp $
+ * $Id: ipcache.cc,v 1.215 1999/04/19 05:15:54 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -262,8 +262,8 @@ ipcache_call_pending(ipcache_entry * i)
     ipcacheUnlockEntry(i);
 }
 
-#if USE_DNSSERVERS
 static ipcache_entry *
+#if USE_DNSSERVERS
 ipcacheParse(const char *inbuf)
 {
     LOCAL_ARRAY(char, buf, DNS_INBUF_SZ);
@@ -333,7 +333,6 @@ ipcacheParse(const char *inbuf)
     return &i;
 }
 #else
-static ipcache_entry *
 ipcacheParse(rfc1035_rr * answers, int nr)
 {
     static ipcache_entry i;