Changeset 1272

Timestamp:

11/15/08 20:58:30 (22 months ago)

Author:

ahu

Message:

make single threaded mode more resilient against exceptions - thanks Daniel Drown

Location:

trunk/pdns/pdns

Files:

• distributor.hh (modified) (1 diff)
• packethandler.cc (modified) (1 diff)

trunk/pdns/pdns/distributor.hh

@@ -242 +242 @@
     Answer *a;
 
-    a=b->question(q);
+    try {
+      a=b->question(q); // a can be NULL!
+    }
+    catch(const AhuException &e) {
+      L<<Logger::Error<<"Backend error: "<<e.reason<<endl;
+      delete b;
+      b=0;
+      return 0;
+    }
+    catch(...) {
+      L<<Logger::Error<<Logger::NTLog<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<endl;
+      delete b;
+      b=0;
+      return 0;
+    }
+
 
     AnswerData AD;

trunk/pdns/pdns/packethandler.cc

@@ -197 +197 @@
 
   if (p->qclass == 3 && p->qtype.getName() == "HINFO") {
-    rr.content = "PowerDNS $Id$";
+    rr.content = "\"PowerDNS\" \"$Id$\"";
     rr.ttl = 5;
     rr.qname=target;