Fix auth logging if no packet cache; from Habbie

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index bce6b27ef67bb758dfa8ef609cb303d83b46639c..102feed64b385647661818591bfd31234eaee106 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -465,14 +465,19 @@ try
     }
 
     if(distributor->isOverloaded()) {
-      if(logDNSQueries) 
+      if(logDNSQueries)
         g_log<<"Dropped query, backends are overloaded"<<endl;
       overloadDrops++;
       continue;
     }
-        
-    if(PC.enabled() && logDNSQueries)
-      g_log<<"packetcache MISS"<<endl;
+
+    if (logDNSQueries) {
+      if (PC.enabled()) {
+        g_log<<"packetcache MISS"<<endl;
+      } else {
+        g_log<<"packetcache SKIP"<<endl;
+      }
+    }
 
     try {
       distributor->question(question, &sendout); // otherwise, give to the distributor

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 5634318dedbd15c436f24d7dd83d7c4a66fc2a28..350e4abfa3e03ad9929efd39e6d64df93dbd7930 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -373,6 +373,10 @@ void *TCPNameserver::doConnection(void *data)
         }
         if(logDNSQueries)
             g_log<<"packetcache MISS"<<endl;
+      } else {
+        if (logDNSQueries) {
+          g_log<<"packetcache SKIP"<<endl;
+        }
       }
       {
         Lock l(&s_plock);