From: Ruben d'Arco <cyclops@prof-x.net>
Date: Sun, 3 Mar 2013 06:32:19 +0000 (+0100)
Subject: Add extra log output and message id to logline
X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7facf34564f7bd3326cd72ec501f1fa5b5fcc86c;p=thirdparty%2Fpdns.git

Add extra log output and message id to logline

THe message id is useful when multiple updates come in, makes it unique.
---

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index d66f0c7f04..2aa8139146 100755
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -9,6 +9,7 @@
 #include "arguments.hh"
 #include "resolver.hh"
 #include "dns_random.hh"
+#include "backends/gsql/ssql.hh"
 
 extern PacketCache PC;
 
@@ -115,6 +116,7 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *
           changedRecords++;
           di->backend->replaceRRSet(di->id, oldRec->qname, oldRec->qtype, rrset);
           *updatedSerial = true;
+          L<<Logger::Notice<<msgPrefix<<"Replacing record "<<rrLabel<<"|"<<rrType.getName()<<endl;
         }
         else
           L<<Logger::Notice<<msgPrefix<<"Provided serial ("<<sdUpdate.serial<<") is older than the current serial ("<<sdOld.serial<<"), ignoring SOA update."<<endl;
@@ -127,6 +129,7 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *
           changedRecords++;
         }
         di->backend->replaceRRSet(di->id, rrLabel, rrType, rrset);
+        L<<Logger::Notice<<msgPrefix<<"Replacing record "<<rrLabel<<"|"<<rrType.getName()<<endl;
 
       // In any other case, we must check if the TYPE and RDATA match to provide an update (which effectily means a update of TTL)
       } else {
@@ -139,8 +142,10 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *
             changedRecords++;
           }
         }
-        if (foundRecord)
+        if (foundRecord) {
           di->backend->replaceRRSet(di->id, rrLabel, rrType, rrset);
+          L<<Logger::Notice<<msgPrefix<<"Replacing record "<<rrLabel<<"|"<<rrType.getName()<<endl;
+        }
       }
     }
 
@@ -254,6 +259,7 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *
 
     }
     di->backend->replaceRRSet(di->id, rrLabel, rrType, rrset);
+    L<<Logger::Notice<<msgPrefix<<"Deleting record "<<rrLabel<<"|"<<rrType.getName()<<endl;
 
 
     if (recordsToDelete.size()) {
@@ -437,7 +443,7 @@ int PacketHandler::processUpdate(DNSPacket *p) {
   if (! ::arg().mustDo("experimental-rfc2136"))
     return RCode::Refused;
   
-  string msgPrefix="UPDATE from " + p->getRemote() + " for " + p->qdomain + ": ";
+  string msgPrefix="UPDATE (" + itoa(p->d.id) + ") from " + p->getRemote() + " for " + p->qdomain + ": ";
   L<<Logger::Info<<msgPrefix<<"Processing started."<<endl;
 
   // Check permissions - IP based
@@ -683,6 +689,7 @@ int PacketHandler::processUpdate(DNSPacket *p) {
     // Section 3.6 - Update the SOA serial - outside of performUpdate because we do a SOA update for the complete update message
     if (changedRecords > 0 && !updatedSerial)
       increaseSerial(msgPrefix, &di, haveNSEC3, narrow, &ns3pr);
+
   }
   catch (AhuException &e) {
     L<<Logger::Error<<msgPrefix<<"Caught AhuException: "<<e.reason<<"; Sending ServFail!"<<endl;