Changeset 2067

Timestamp:

03/16/11 20:11:15 (2 years ago)

Author:

ahu

Message:

add error checking for the Lua incoming AXFR filter script. jp_mens, pls update your blog ;-)

Files:

• trunk/pdns/pdns/slavecommunicator.cc (modified) (1 diff)

trunk/pdns/pdns/slavecommunicator.cc

@@ -115 +115 @@
     vector<string> scripts;
     if(B->getDomainMetadata(domain, "LUA-AXFR-SCRIPT", scripts) && !scripts.empty()) {
-      pdl.reset(new PowerDNSLua(scripts[0]));
-      L<<Logger::Info<<"Loaded Lua script '"<<scripts[0]<<"' to edit the incoming AXFR of '"<<domain<<"'"<<endl;
+      try {
+        pdl.reset(new PowerDNSLua(scripts[0]));
+        L<<Logger::Info<<"Loaded Lua script '"<<scripts[0]<<"' to edit the incoming AXFR of '"<<domain<<"'"<<endl;
+      }
+      catch(std::exception& e) {
+        L<<Logger::Error<<"Failed to load Lua editing script '"<<scripts[0]<<"' for incoming AXFR of '"<<domain<<"': "<<e.what()<<endl;
+        return;
+      }
     }
     AXFRRetriever retriever(raddr, domain.c_str(), tsigkeyname, tsigalgorithm, tsigsecret);