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: rec-4.1.3~4^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a7d779feafe9bb65d1cc2dc1dcfe918345b063c;p=pdns

rec: Fix the logged delay in the RPZ retriever thread

(cherry picked from commit 7a4bed25f45636f1ef23c99093ac432ec412ddc4)
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index f549cf28c..e1342dbd8 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) {
-      theL()<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.what()<<"'. (Will try again in "<<refresh<<" seconds...)"<<endl;
+      theL()<<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) {
-      theL()<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.reason<<"'. (Will try again in "<<refresh<<" seconds...)"<<endl;
+      theL()<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.reason<<"'. (Will try again in "<<(refresh > 0 ? refresh : 10)<<" seconds...)"<<endl;
       incRPZFailedTransfers(polName);
     }