Changeset 2627

Timestamp:

06/15/12 15:15:35 (11 months ago)

Author:

peter

Message:

report error on rec_control reload-lua-script, fixing #278

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -1502 +1502 @@
 
   
-void* doReloadLuaScript()
+string* doReloadLuaScript()
 {
   string fname= ::arg()["lua-dns-script"];
@@ -1509 +1509 @@
       t_pdl->reset();
       L<<Logger::Error<<t_id<<" Unloaded current lua script"<<endl;
+      return new string("unloaded\n");
     }
     else {
@@ -1516 +1517 @@
   catch(std::exception& e) {
     L<<Logger::Error<<t_id<<" Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
+    return new string("retaining current script, error from '"+fname+"': "+e.what()+"\n");
   }
     
   L<<Logger::Warning<<t_id<<" (Re)loaded lua script from '"<<fname<<"'"<<endl;
-  return 0;
+  return new string("(re)loaded '"+fname+"'\n");
 }
 
@@ -1527 +1529 @@
     ::arg().set("lua-dns-script") = *begin;
   
-  broadcastFunction(doReloadLuaScript);
-  
-  return "ok, reload/unload queued\n";
+  return broadcastAccFunction<string>(doReloadLuaScript);
 }