From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sun, 6 Dec 2015 18:38:42 +0000 (+0100)
Subject: log when adding a dynamic block
X-Git-Tag: dnsdist-1.0.0-alpha1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32c99b3d14a3ef02e7fc30ce3855329bb8c56cf9;p=thirdparty%2Fpdns.git

log when adding a dynamic block
---

diff --git a/pdns/dnsdist-lua2.cc b/pdns/dnsdist-lua2.cc
index 21cf7f7ace..47bdd7de26 100644
--- a/pdns/dnsdist-lua2.cc
+++ b/pdns/dnsdist-lua2.cc
@@ -144,7 +144,8 @@ void moreLua()
 			   struct timespec until, now;
 			   clock_gettime(CLOCK_MONOTONIC, &now);
 			   until=now;
-			   until.tv_sec += seconds ? *seconds : 10;
+                           int actualSeconds = seconds ? *seconds : 10;
+			   until.tv_sec += actualSeconds; 
 			   for(const auto& capair : m) {
 			     unsigned int count;
 			     if(auto got = slow.lookup(Netmask(capair.first))) {
@@ -155,23 +156,13 @@ void moreLua()
 			     }
 			     DynBlock db{msg,until};
 			     db.blocks=count;
+                             warnlog("Inserting dynamic block for %s for %d seconds: %s", capair.first.toString(), actualSeconds, msg);
 			     slow.insert(Netmask(capair.first)).second=db;
 			   }
 			   g_dynblockNMG.setState(slow);
 			 });
 
 
-
-  g_lua.registerFunction<void(nmts_t::*)(const map<ComboAddress,int>&, const std::string&, boost::optional<int>)>("add", 
-											    [](nmts_t& s, const map<ComboAddress,int>& m, const std::string& msg, boost::optional<int> seconds) { 
-											      struct timespec until;
-											      clock_gettime(CLOCK_MONOTONIC, &until);
-											      until.tv_sec += seconds ? *seconds : 10;
-											      for(const auto& capair : m)
-												s.insert(Netmask(capair.first)).second={msg, until};
-											    });
-
-
   g_lua.registerFunction<bool(nmts_t::*)(const ComboAddress&)>("match", 
 								     [](nmts_t& s, const ComboAddress& ca) { return s.match(ca); });