From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 1 Apr 2016 20:06:37 +0000 (+0200)
Subject: Revert "Make pdns die on fatal error"
X-Git-Tag: dnsdist-1.0.0-beta1~31^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3666%2Fhead;p=thirdparty%2Fpdns.git

Revert "Make pdns die on fatal error"

This reverts commit ff1ac70002cc705285a58daf4dcb6ccbb4b7e312.
---

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index e940c908bb..234fa86973 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -202,8 +202,6 @@ 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;
@@ -225,7 +223,6 @@ 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;
@@ -247,8 +244,6 @@ 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;