improve error checking and reporting of selftest

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@759 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index 9bf7866ae3149cbc475451aa456c391ff463e3c5..4c0b243d39e1771814ebfcca3bdbfcb6a68957f9 100644 (file)
--- a/pdns/epollmplexer.cc
+++ b/pdns/epollmplexer.cc
@@ -66,6 +66,7 @@ EpollFDMultiplexer::EpollFDMultiplexer() : d_eevents(new epoll_event[s_maxevents
   }
   catch(FDMultiplexerException &fe) {
     close(fd);
+    close(d_epollfd);
     throw FDMultiplexerException("epoll multiplexer failed self-test: "+string(fe.what()));
   }
     

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index a649d82d4ea6b758970fc8779b7e31dcee59c1c9..20bca2c58fa5fdee12ad59d3d7b7a4c2b1c66d68 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1136,7 +1136,7 @@ FDMultiplexer* getMultiplexer()
       return ret;
     }
     catch(FDMultiplexerException &fe) {
-      L<<Logger::Error<<"Non-fatal error initializing possible multiplexer: "<<fe.what()<<endl;
+      L<<Logger::Error<<"Non-fatal error initializing possible multiplexer ("<<fe.what()<<"), falling back"<<endl;
     }
     catch(...) {
       L<<Logger::Error<<"Non-fatal error initializing possible multiplexer"<<endl;