From c823f860528558d511432cbffdfa8d3a7d61780e Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 2 May 2016 13:46:13 +0200
Subject: [PATCH] further logging silencing

---
 pdns/rec-lua-conf.cc | 2 ++
 pdns/rpzloader.cc    | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 90fdfd1d38..4dd1010bb3 100644
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -114,7 +114,9 @@ void loadRecursorLuaConfig(const std::string& fname)
 	    }
 	  }
 	}
+        theL()<<Logger::Warning<<"Loading RPZ from file '"<<fname<<"'"<<endl;
 	loadRPZFromFile(fname, lci.dfe, polName, defpol, 0);
+        theL()<<Logger::Warning<<"Done loading RPZ from file '"<<fname<<"'"<<endl;
       }
       catch(std::exception& e) {
 	theL()<<Logger::Error<<"Unable to load RPZ zone from '"<<fname<<"': "<<e.what()<<endl;
diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 4c27a8f3c5..90a2dace32 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -142,6 +142,7 @@ shared_ptr<SOARecordContent> loadRPZFromServer(const ComboAddress& master, const
   return sr;
 }
 
+// this function is silent - you do the logging
 int loadRPZFromFile(const std::string& fname, DNSFilterEngine& target, const std::string& polName, boost::optional<DNSFilterEngine::Policy> defpol, int place)
 {
   ZoneParserTNG zpt(fname);
@@ -154,7 +155,6 @@ int loadRPZFromFile(const std::string& fname, DNSFilterEngine& target, const std
       DNSRecord dr(drr);
       if(dr.d_type == QType::SOA) {
 	domain = dr.d_name;
-//	cerr<<"Origin is "<<domain<<endl;
       }
       else if(dr.d_type == QType::NS) {
 	continue;
@@ -165,8 +165,7 @@ int loadRPZFromFile(const std::string& fname, DNSFilterEngine& target, const std
       }
     }
     catch(PDNSException& pe) {
-      cerr<<"Issue parsing '"<<drr.qname<<"' '"<<drr.content<<"' at "<<zpt.getLineOfFile()<<endl;
-      cerr<<pe.reason<<endl;
+      throw PDNSException("Issue parsing '"+drr.qname.toString()+"' '"+drr.content+"' at "+zpt.getLineOfFile()+": "+pe.reason);
     }
   }
   
-- 
2.47.2