From 0a7f24cb8edff9992e36dd6c129e1401e6890cf5 Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 21 Apr 2006 21:11:53 +0000
Subject: [PATCH] improve error checking and reporting of selftest

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@759 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/epollmplexer.cc  | 1 +
 pdns/pdns_recursor.cc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index 9bf7866ae..4c0b243d3 100644
--- 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 a649d82d4..20bca2c58 100644
--- 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;
-- 
2.40.0