BIND 10 trac2983, updated. 8abbdb589f6205c51f461541778f40dd355db60b [2983] Pushed minor change to CalloutManager

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Aug 21 14:32:24 UTC 2013


The branch, trac2983 has been updated
       via  8abbdb589f6205c51f461541778f40dd355db60b (commit)
      from  3b8241154843db71a970ebc30b04fdc3a5e73d33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8abbdb589f6205c51f461541778f40dd355db60b
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Aug 21 16:32:13 2013 +0200

    [2983] Pushed minor change to CalloutManager

-----------------------------------------------------------------------

Summary of changes:
 src/lib/hooks/callout_manager.cc |    5 +++--
 src/lib/hooks/hooks_messages.mes |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/hooks/callout_manager.cc b/src/lib/hooks/callout_manager.cc
index df27f45..166fda1 100644
--- a/src/lib/hooks/callout_manager.cc
+++ b/src/lib/hooks/callout_manager.cc
@@ -157,12 +157,13 @@ CalloutManager::callCallouts(int hook_index, CalloutHandle& callout_handle) {
                             .getName(current_hook_))
                         .arg(PointerConverter(i->second).dlsymPtr());
                 }
-            } catch (...) {
+            } catch (const std::exception& e) {
                 // Any exception, not just ones based on isc::Exception
                 LOG_ERROR(hooks_logger, HOOKS_CALLOUT_EXCEPTION)
                     .arg(current_library_)
                     .arg(ServerHooks::getServerHooks().getName(current_hook_))
-                    .arg(PointerConverter(i->second).dlsymPtr());
+                    .arg(PointerConverter(i->second).dlsymPtr())
+                    .arg(e.what());
             }
 
         }
diff --git a/src/lib/hooks/hooks_messages.mes b/src/lib/hooks/hooks_messages.mes
index 68b6e3c..ebaed41 100644
--- a/src/lib/hooks/hooks_messages.mes
+++ b/src/lib/hooks/hooks_messages.mes
@@ -44,7 +44,7 @@ is issued.  It identifies the hook to which the callout is attached, the
 index of the library (in the list of loaded libraries) that registered
 it and the address of the callout.  The error is otherwise ignored.
 
-% HOOKS_CALLOUT_EXCEPTION exception thrown by callout on hook %1 registered by library with index %2 (callout address %3)
+% HOOKS_CALLOUT_EXCEPTION exception thrown by callout on hook %1 registered by library with index %2 (callout address %3): %4
 If a callout throws an exception when called, this error message is
 issued.  It identifies the hook to which the callout is attached, the
 index of the library (in the list of loaded libraries) that registered



More information about the bind10-changes mailing list