From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 28 Oct 2019 11:21:49 +0000 (+0100)
Subject: Fix auth logging if no packet cache; from Habbie
X-Git-Tag: auth-4.3.0-beta1~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe4b0418cd097c272272d55628a563b9e8e3d22;p=thirdparty%2Fpdns.git

Fix auth logging if no packet cache; from Habbie
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index bce6b27ef6..102feed64b 100644
--- 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 5634318ded..350e4abfa3 100644
--- 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);