From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 26 Oct 2015 15:50:05 +0000 (+0200)
Subject: Make pdns die on fatal error
X-Git-Tag: dnsdist-1.0.0-alpha1~252^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff1ac70002cc705285a58daf4dcb6ccbb4b7e312;p=pdns

Make pdns die on fatal error
---

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index eb0f645c7..f15ac2206 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -202,6 +202,8 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
         S.ringAccount("servfail-queries",QD->Q->qdomain.toString());
 
 	delete QD->Q;
+	QD->callback(a);
+	throw;
       }
       catch(...) {
         L<<Logger::Error<<"Caught unknown exception in Distributor thread "<<(long)pthread_self()<<endl;
@@ -223,6 +225,7 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
   }
   catch(const PDNSException &AE) {
     L<<Logger::Error<<"Distributor caught fatal exception: "<<AE.reason<<endl;
+    throw;
   }
   catch(...) {
     L<<Logger::Error<<"Caught an unknown exception when creating backend, probably"<<endl;
@@ -244,6 +247,8 @@ template<class Answer, class Question, class Backend>int SingleThreadDistributor
     a->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
     S.ringAccount("servfail-queries",q->qdomain.toString());
+    callback(a);
+    throw;
   }
   catch(...) {
     L<<Logger::Error<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<endl;