]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
rec: Fix 'worker' conflict with #6812 6768/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 30 Jul 2018 13:24:07 +0000 (15:24 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 30 Jul 2018 13:24:07 +0000 (15:24 +0200)
pdns/lua-recursor4.hh
pdns/pdns_recursor.cc

index 6c0bf7ce5f070b782dc6e7a412bb3086e50a0109..10928c5cd942b5298b4a8a33c9a6c1d26184fe70 100644 (file)
@@ -38,7 +38,7 @@
 #include "lua-recursor4-ffi.hh"
 
 string GenUDPQueryResponse(const ComboAddress& dest, const string& query);
-int getRecursorThreadId();
+unsigned int getRecursorThreadId();
 
 // pdns_ffi_param_t is a lightuserdata
 template<>
index 64c4c1e965e4ac42f543d5235f67b2b20b50b3f1..b9e2ea30d4f42ff788ef5e08c929fb4db544417e 100644 (file)
@@ -318,7 +318,7 @@ ArgvMap &arg()
   return theArg;
 }
 
-int getRecursorThreadId()
+unsigned int getRecursorThreadId()
 {
   return t_id;
 }
@@ -3694,7 +3694,7 @@ try
   setupNODThread();
 #endif /* NOD_ENABLED */
   
-  if(worker && (!g_weDistributeQueries || t_id != s_distributorThreadID)) {
+  if(threadInfo.isWorker) {
     try {
       if(!::arg()["lua-dns-script"].empty()) {
         t_pdl = std::make_shared<RecursorLua4>();