From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 20 Jan 2021 11:56:33 +0000 (+0100)
Subject: rename replication-cycle-interval to xfr-cycle-interval
X-Git-Tag: dnsdist-1.6.0-rc1~32^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f20540229a78e00fd40bd1f7184c42982a13bc;p=thirdparty%2Fpdns.git

rename replication-cycle-interval to xfr-cycle-interval
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index b100469407..0453b83266 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -141,7 +141,7 @@ void declareArguments()
   ::arg().set("also-notify", "When notifying a domain, also notify these nameservers")="";
   ::arg().set("allow-notify-from","Allow AXFR NOTIFY from these IP ranges. If empty, drop all incoming notifies.")="0.0.0.0/0,::/0";
   ::arg().set("slave-cycle-interval","Schedule slave freshness checks once every .. seconds")="60";
-  ::arg().set("replication-cycle-interval","Schedule primary/secondary replication freshness checks once every .. seconds")="60";
+  ::arg().set("xfr-cycle-interval","Schedule primary/secondary SOA freshness checks once every .. seconds")="60";
 
   ::arg().set("tcp-control-address","If set, PowerDNS can be controlled over TCP on this address")="";
   ::arg().set("tcp-control-port","If set, PowerDNS can be controlled over TCP on this address")="53000";
diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index dda4909456..a674091f9a 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -114,7 +114,7 @@ void CommunicatorClass::mainloop()
     signal(SIGPIPE,SIG_IGN);
     g_log<<Logger::Error<<"Primary/secondary communicator launching"<<endl;
     PacketHandler P;
-    d_tickinterval=min(::arg().asNum("slave-cycle-interval"), ::arg().asNum("replication-cycle-interval"));
+    d_tickinterval=min(::arg().asNum("slave-cycle-interval"), ::arg().asNum("xfr-cycle-interval"));
     makeNotifySockets();
 
     int rc;
diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index 5e5551a346..0ef4981b1e 100644
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -35,7 +35,7 @@ __EOF__
 	$RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \
 		--config-name=gsqlite32 --socket-dir=./ --no-shuffle \
 		--secondary --retrieval-threads=4 \
-		--replication-cycle-interval=300 --dname-processing &
+		--xfr-cycle-interval=300 --dname-processing &
 
 	echo 'waiting for zones to be slaved'
 	set +e