Fix gsql query-logging not always working

query-logging would only be taken into account after the first direct
(DNS) query; getAllDomains and other calls before the first query would
not get the logging. Problematic when the backend instances are
short-lived.

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 2c84899e27252fc1fa9aab9fe0a156b8f0f8d4e4..8f8f816ca5ccb8e71f0157fa4b695326abc5888e 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -786,8 +786,6 @@ void GSQLBackend::lookup(const QType &qtype,const string &qname, DNSPacket *pkt_
   string format;
   char output[1024];
 
-  d_db->setLog(::arg().mustDo("query-logging"));
-
   string lcqname=toLower(qname);
   
   // lcqname=labelReverse(makeRelative(lcqname, "net"));

diff --git a/pdns/backends/gsql/gsqlbackend.hh b/pdns/backends/gsql/gsqlbackend.hh
index 7b2da843df0629553a864dc31aab4eb4e54fe505..efc417512672d873bbbee0fd633894b84372882a 100644 (file)
--- a/pdns/backends/gsql/gsqlbackend.hh
+++ b/pdns/backends/gsql/gsqlbackend.hh
@@ -1,6 +1,7 @@
 #include <string>
 #include <map>
 #include "ssql.hh"
+#include "pdns/arguments.hh"
 
 #include "../../namespaces.hh"
 
@@ -20,6 +21,9 @@ public:
   void setDB(SSql *db)
   {
     d_db=db;
+    if (d_db) {
+      d_db->setLog(::arg().mustDo("query-logging"));
+    }
   }
   
   virtual string sqlEscape(const string &name);