]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
catch all exceptions coming from secpoll, this was a regression of this PR 6014/head
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 8 Nov 2017 14:57:05 +0000 (15:57 +0100)
committerErik Winkels <erik.winkels@powerdns.com>
Tue, 28 Nov 2017 12:02:08 +0000 (13:02 +0100)
(cherry picked from commit 47e9b74f9ee097b9bdc029c21c9edfb2f7532102)

pdns/pdns_recursor.cc

index bdbfd3c6c72a72ee617e08e70364ca8f3ebbe122..dbc1a9b53b91dbbaab0199aa5ed85a3e3ec70be7 100644 (file)
@@ -2028,6 +2028,15 @@ static void houseKeeping(void *)
         {
           L<<Logger::Error<<"Exception while performing security poll: "<<e.what()<<endl;
         }
+        catch(PDNSException& e)
+        {
+          L<<Logger::Error<<"Exception while performing security poll: "<<e.reason<<endl;
+        }
+        catch(...)
+        {
+          L<<Logger::Error<<"Exception while performing security poll"<<endl;
+        }
+
       }
     }
     s_running=false;