Exit on backend instantiation failure

This also undoes a badly working change made in 74a04266.

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 2ff20b8951fdbba20cb4eebe5b61a2b6aec01d3c..f171352959fc19cdd73ddec2cce93a653cf1e7fc 100644 (file)
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -741,7 +741,7 @@ void Bind2Backend::loadConfig(string* status)
     }
     catch(PDNSException &ae) {
       L<<Logger::Error<<"Error parsing bind configuration: "<<ae.reason<<endl;
-      return;
+      throw;
     }
       
     vector<BindDomainInfo> domains=BP.getDomains();

diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index ed8a16dbb4fc44efa1726558401dad84825e1607..e87e0310720d90531fc5c69b31c34f052e2d5c43 100644 (file)
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -209,13 +209,13 @@ vector<DNSBackend *>BackendMakerClass::all(bool metadataOnly)
     L<<Logger::Error<<"Cleaning up"<<endl;
     for(vector<DNSBackend *>::const_iterator i=ret.begin();i!=ret.end();++i)
       delete *i;
-    throw;
+    exit(1);
   } catch(...) {
     // and cleanup
     L<<Logger::Error<<"Caught an exception instantiating a backend, cleaning up"<<endl;
     for(vector<DNSBackend *>::const_iterator i=ret.begin();i!=ret.end();++i)
       delete *i;
-    throw;
+    exit(1);
   }
 
   return ret;