From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 28 Oct 2016 13:31:53 +0000 (+0200)
Subject: extract nested exception from Luawrapper
X-Git-Tag: rec-4.0.7~2^2~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00e1743c193f61f807793d0d2d3a20f8167b04d2;p=pdns

extract nested exception from Luawrapper

Before:
Oct 28 15:30:34 STL error (www.foobar.com/A from 127.0.0.1): Exception thrown by a callback function called by Lua

After:
Oct 28 15:30:34 STL error (www.foobar.com/A from 127.0.0.1): Exception thrown by a callback function called by Lua. Extra info: Found . in wrong position in DNSName www.foobar.com..internal

reported by @elad, thanks!

(cherry picked from commit 068c763422b5830dc15598089f7760e79f5bdf81)
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 4efc81e48..6a8ff77bb 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1216,7 +1216,16 @@ void startDoResolve(void *p)
     delete dc;
   }
   catch(std::exception& e) {
-    L<<Logger::Error<<"STL error "<< makeLoginfo(dc)<<": "<<e.what()<<endl;
+    L<<Logger::Error<<"STL error "<< makeLoginfo(dc)<<": "<<e.what();
+
+    // Luawrapper nests the exception from Lua, so we unnest it here
+    try {
+        std::rethrow_if_nested(e);
+    } catch(const std::exception& e) {
+        L<<". Extra info: "<<e.what();
+    } catch(...) {}
+
+    L<<endl;
     delete dc;
   }
   catch(...) {