]> granicus.if.org Git - pdns/commitdiff
dnsdist: Don't create a Remote Logger in client mode
authorRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 25 Oct 2017 15:27:05 +0000 (17:27 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 25 Oct 2017 15:27:05 +0000 (17:27 +0200)
pdns/dnsdist-lua2.cc
pdns/dnsrulactions.hh

index 40c195f4baa0cce84eb41b42e453b735bf765245..7e043ef395f9934701413125f41a51d62fbda25e 100644 (file)
@@ -875,6 +875,9 @@ void moreLua(bool client)
       });
 
     g_lua.writeFunction("newRemoteLogger", [client](const std::string& remote, boost::optional<uint16_t> timeout, boost::optional<uint64_t> maxQueuedEntries, boost::optional<uint8_t> reconnectWaitTime) {
+        if (client) {
+          return std::shared_ptr<RemoteLogger>();
+        }
         return std::make_shared<RemoteLogger>(ComboAddress(remote), timeout ? *timeout : 2, maxQueuedEntries ? *maxQueuedEntries : 100, reconnectWaitTime ? *reconnectWaitTime : 1);
       });
 
index 2730ba565f8da21409e30ec20b3f7c703dc84037..6c26a5a066dab09d31e7fd006c66227be6c59321 100644 (file)
@@ -1272,7 +1272,7 @@ public:
   }
   string toString() const override
   {
-    return "remote log to " + d_logger->toString();
+    return "remote log to " + (d_logger ? d_logger->toString() : "");
   }
 private:
   std::shared_ptr<RemoteLogger> d_logger;
@@ -1329,7 +1329,7 @@ public:
   }
   string toString() const override
   {
-    return "remote log response to " + d_logger->toString();
+    return "remote log response to " + (d_logger ? d_logger->toString() : "");
   }
 private:
   std::shared_ptr<RemoteLogger> d_logger;