From 74f6d6e10b009ca0f26fb69f41349c981cd168eb Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Thu, 28 Jul 2016 23:23:56 +0200
Subject: [PATCH] use toLogString() for ringAccount

---
 pdns/common_startup.cc     | 2 +-
 pdns/distributor.hh        | 8 ++++----
 pdns/packethandler.cc      | 6 +++---
 pdns/responsestats-auth.cc | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 4d7d8daf2a..46f3d50159 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -387,7 +387,7 @@ void *qthread(void *number)
      if(P->d.qr)
        continue;
 
-    S.ringAccount("queries", P->qdomain.toString()+"/"+P->qtype.getName());
+    S.ringAccount("queries", P->qdomain.toLogString()+"/"+P->qtype.getName());
     S.ringAccount("remotes",P->d_remote);
     if(logDNSQueries) {
       string remote;
diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index d1940ec691..b5be8503a6 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -217,7 +217,7 @@ retry:
 
           a->setRcode(RCode::ServFail);
           S.inc("servfail-packets");
-          S.ringAccount("servfail-queries",QD->Q->qdomain.toString());
+          S.ringAccount("servfail-queries",QD->Q->qdomain.toLogString());
 
           delete QD->Q;
         } else {
@@ -234,7 +234,7 @@ retry:
 
           a->setRcode(RCode::ServFail);
           S.inc("servfail-packets");
-          S.ringAccount("servfail-queries",QD->Q->qdomain.toString());
+          S.ringAccount("servfail-queries",QD->Q->qdomain.toLogString());
 
           delete QD->Q;
         } else {
@@ -281,7 +281,7 @@ retry:
 
       a->setRcode(RCode::ServFail);
       S.inc("servfail-packets");
-      S.ringAccount("servfail-queries",q->qdomain.toString());
+      S.ringAccount("servfail-queries",q->qdomain.toLogString());
     } else {
       L<<Logger::Error<<"Backend error (retry once): "<<e.reason<<endl;
       goto retry;
@@ -296,7 +296,7 @@ retry:
 
       a->setRcode(RCode::ServFail);
       S.inc("servfail-packets");
-      S.ringAccount("servfail-queries",q->qdomain.toString());
+      S.ringAccount("servfail-queries",q->qdomain.toLogString());
     } else {
       L<<Logger::Error<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<" (retry once)"<<endl;
       goto retry;
diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 90a66d2790..a2d1600038 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1001,7 +1001,7 @@ void PacketHandler::makeNOError(DNSPacket* p, DNSPacket* r, const DNSName& targe
   if(d_dk.isSecuredZone(sd.qname))
     addNSECX(p, r, target, wildcard, sd.qname, mode);
 
-  S.ringAccount("noerror-queries",p->qdomain.toString()+"/"+p->qtype.getName());
+  S.ringAccount("noerror-queries",p->qdomain.toLogString()+"/"+p->qtype.getName());
 }
 
 
@@ -1516,7 +1516,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     r=p->replyPacket(); // generate an empty reply packet
     r->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
-    S.ringAccount("servfail-queries",p->qdomain.toString());
+    S.ringAccount("servfail-queries",p->qdomain.toLogString());
   }
   catch(PDNSException &e) {
     L<<Logger::Error<<"Backend reported permanent error which prevented lookup ("+e.reason+"), aborting"<<endl;
@@ -1528,7 +1528,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     r=p->replyPacket(); // generate an empty reply packet
     r->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
-    S.ringAccount("servfail-queries",p->qdomain.toString());
+    S.ringAccount("servfail-queries",p->qdomain.toLogString());
   }
   return r; 
 
diff --git a/pdns/responsestats-auth.cc b/pdns/responsestats-auth.cc
index 8af59d0398..2112dce2a6 100644
--- a/pdns/responsestats-auth.cc
+++ b/pdns/responsestats-auth.cc
@@ -24,9 +24,9 @@ void ResponseStats::submitResponse(DNSPacket &p, bool udpOrTCP) {
 
   if(p.d.aa) {
     if (p.d.rcode==RCode::NXDomain)
-      S.ringAccount("nxdomain-queries",p.qdomain.toString()+"/"+p.qtype.getName());
+      S.ringAccount("nxdomain-queries",p.qdomain.toLogString()+"/"+p.qtype.getName());
   } else if (p.isEmpty()) {
-    S.ringAccount("unauth-queries",p.qdomain.toString()+"/"+p.qtype.getName());
+    S.ringAccount("unauth-queries",p.qdomain.toLogString()+"/"+p.qtype.getName());
     S.ringAccount("remotes-unauth",p.d_remote);
   }
 
-- 
2.47.2