From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 11 Apr 2018 10:13:24 +0000 (+0200)
Subject: rec: Fix the logged delay in the RPZ retriever thread
X-Git-Tag: dnsdist-1.3.1~161^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6469%2Fhead;p=thirdparty%2Fpdns.git

rec: Fix the logged delay in the RPZ retriever thread
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index bb077e8108..0473ceac12 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -300,11 +300,11 @@ void RPZIXFRTracker(const ComboAddress& master, boost::optional<DNSFilterEngine:
       setRPZZoneNewState(polName, sr->d_st.serial, zone->size(), true);
     }
     catch(const std::exception& e) {
-      g_log<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.what()<<"'. (Will try again in "<<refresh<<" seconds...)"<<endl;
+      g_log<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.what()<<"'. (Will try again in "<<(refresh > 0 ? refresh : 10)<<" seconds...)"<<endl;
       incRPZFailedTransfers(polName);
     }
     catch(const PDNSException& e) {
-      g_log<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.reason<<"'. (Will try again in "<<refresh<<" seconds...)"<<endl;
+      g_log<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.reason<<"'. (Will try again in "<<(refresh > 0 ? refresh : 10)<<" seconds...)"<<endl;
       incRPZFailedTransfers(polName);
     }