From 1b16851b89f6c8f70771a2eb4f08e424c85f7c7a Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 30 Oct 2019 12:14:32 +0100
Subject: [PATCH] Do not log SKIP on each packet when PC is disabled.

---
 pdns/common_startup.cc | 13 ++++++++-----
 pdns/tcpreceiver.cc    |  8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 102feed64b..7a09bd66c8 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -442,14 +442,13 @@ try
         "', do = " <<question.d_dnssecOk <<", bufsize = "<< question.getMaxReplyLen();
       if(question.d_ednsRawPacketSizeLimit > 0 && question.getMaxReplyLen() != (unsigned int)question.d_ednsRawPacketSizeLimit)
         g_log<<" ("<<question.d_ednsRawPacketSizeLimit<<")";
-      g_log<<": ";
     }
 
     if(PC.enabled() && (question.d.opcode != Opcode::Notify && question.d.opcode != Opcode::Update) && question.couldBeCached()) {
       bool haveSomething=PC.get(question, cached); // does the PacketCache recognize this question?
       if (haveSomething) {
         if(logDNSQueries)
-          g_log<<"packetcache HIT"<<endl;
+          g_log<<": packetcache HIT"<<endl;
         cached.setRemote(&question.d_remote);  // inlined
         cached.setSocket(question.getSocket());                               // inlined
         cached.d_anyLocal = question.d_anyLocal;
@@ -466,16 +465,16 @@ try
 
     if(distributor->isOverloaded()) {
       if(logDNSQueries)
-        g_log<<"Dropped query, backends are overloaded"<<endl;
+        g_log<<": Dropped query, backends are overloaded"<<endl;
       overloadDrops++;
       continue;
     }
 
     if (logDNSQueries) {
       if (PC.enabled()) {
-        g_log<<"packetcache MISS"<<endl;
+        g_log<<": packetcache MISS"<<endl;
       } else {
-        g_log<<"packetcache SKIP"<<endl;
+        g_log<<endl;
       }
     }
 
@@ -533,6 +532,10 @@ void mainthread()
    PC.setMaxEntries(::arg().asNum("max-packet-cache-entries"));
    QC.setMaxEntries(::arg().asNum("max-cache-entries"));
 
+   if (!PC.enabled() && ::arg().mustDo("log-dns-queries")) {
+     g_log<<Logger::Warning<<"Packet cache disabled, logging queries without HIT/MISS"<<endl;
+   }
+
    stubParseResolveConf();
 
    if(!::arg()["chroot"].empty()) {
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 350e4abfa3..e71c1d24f3 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -356,13 +356,13 @@ void *TCPNameserver::doConnection(void *data)
         else
           remote_text = packet->getRemote().toString();
         g_log << Logger::Notice<<"TCP Remote "<< remote_text <<" wants '" << packet->qdomain<<"|"<<packet->qtype.getName() <<
-        "', do = " <<packet->d_dnssecOk <<", bufsize = "<< packet->getMaxReplyLen()<<": ";
+        "', do = " <<packet->d_dnssecOk <<", bufsize = "<< packet->getMaxReplyLen();
       }
 
       if(PC.enabled()) {
         if(packet->couldBeCached() && PC.get(*packet, *cached)) { // short circuit - does the PacketCache recognize this question?
           if(logDNSQueries)
-            g_log<<"packetcache HIT"<<endl;
+            g_log<<": packetcache HIT"<<endl;
           cached->setRemote(&packet->d_remote);
           cached->d.id=packet->d.id;
           cached->d.rd=packet->d.rd; // copy in recursion desired bit
@@ -372,10 +372,10 @@ void *TCPNameserver::doConnection(void *data)
           continue;
         }
         if(logDNSQueries)
-            g_log<<"packetcache MISS"<<endl;
+            g_log<<": packetcache MISS"<<endl;
       } else {
         if (logDNSQueries) {
-          g_log<<"packetcache SKIP"<<endl;
+          g_log<<endl;
         }
       }
       {
-- 
2.47.2