From 2cfc20bdee45240a551fdded997c594505e39fc1 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@powerdns.com>
Date: Tue, 10 Oct 2017 15:50:22 +0200
Subject: [PATCH] improve logging of errors in carbon & web services thread

---
 pdns/rec-carbon.cc  |  4 ++++
 pdns/ws-recursor.cc | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pdns/rec-carbon.cc b/pdns/rec-carbon.cc
index 290750930..5cf085ba9 100644
--- a/pdns/rec-carbon.cc
+++ b/pdns/rec-carbon.cc
@@ -73,3 +73,7 @@ catch(std::exception& e)
 {
   L<<Logger::Error<<"Error in carbon thread: "<<e.what()<<endl;
 }
+catch(...)
+{
+  L<<Logger::Error<<"Unknown error in carbon thread"<<endl;
+}
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index e54d81258..4ffa219bd 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -539,15 +539,23 @@ void RecursorWebServer::jsonstat(HttpRequest* req, HttpResponse *resp)
 
 void AsyncServerNewConnectionMT(void *p) {
   AsyncServer *server = (AsyncServer*)p;
+  
   try {
-    auto socket = server->accept();
+    auto socket = server->accept(); // this is actually a shared_ptr
     if (socket) {
       server->d_asyncNewConnectionCallback(socket);
     }
   } catch (NetworkError &e) {
     // we're running in a shared process/thread, so can't just terminate/abort.
+    L<<Logger::Error<<"Network error in web thread: "<<e.what()<<endl;
     return;
   }
+  catch (...) {
+    L<<Logger::Error<<"Unknown error in web thread: "<<endl;
+
+    return;
+  }
+
 }
 
 void AsyncServer::asyncWaitForConnections(FDMultiplexer* fdm, const newconnectioncb_t& callback)
-- 
2.40.0