]> granicus.if.org Git - pdns/commitdiff
Revert "Make pdns die on fatal error"
authorKees Monshouwer <mind04@monshouwer.org>
Fri, 1 Apr 2016 20:06:37 +0000 (22:06 +0200)
committermind04 <mind04@monshouwer.org>
Fri, 1 Apr 2016 22:21:22 +0000 (00:21 +0200)
This reverts commit ff1ac70002cc705285a58daf4dcb6ccbb4b7e312.

pdns/distributor.hh

index e940c908bb6c83a4bdd01952a87b2c01321c00de..234fa869733f050c3c9174974fce707ab27eba84 100644 (file)
@@ -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;