#245 Add additional catch blocks for GRAPHENE_TRY_NOTIFY

peerplays-network · Jan 28, 2022 · 43fbe98 · 43fbe98
1 parent d4c7c97
commit 43fbe98
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/libraries/chain/include/graphene/chain/exceptions.hpp b/libraries/chain/include/graphene/chain/exceptions.hpp
@@ -23,6 +23,7 @@
  */
 #pragma once
 
+#include <boost/exception/diagnostic_information.hpp> 
 #include <fc/exception/exception.hpp>
 #include <graphene/chain/protocol/protocol.hpp>
 
@@ -65,19 +66,27 @@
       msg                                                             \
       )
 
-#define GRAPHENE_TRY_NOTIFY( signal, ... )                                    \
-   try                                                                        \
-   {                                                                          \
-      signal( __VA_ARGS__ );                                                  \
-   }                                                                          \
-   catch( const graphene::chain::plugin_exception& e )                        \
-   {                                                                          \
-      elog( "Caught plugin exception: ${e}", ("e", e.to_detail_string() ) );  \
-      throw;                                                                  \
-   }                                                                          \
-   catch( ... )                                                               \
-   {                                                                          \
-      wlog( "Caught unexpected exception in plugin" );                        \
+#define GRAPHENE_TRY_NOTIFY( signal, ... )                                                      \
+   try                                                                                          \
+   {                                                                                            \
+      signal( __VA_ARGS__ );                                                                    \
+   }                                                                                            \
+   catch( const graphene::chain::plugin_exception& e )                                          \
+   {                                                                                            \
+      elog( "Caught plugin exception: ${e}", ("e", e.to_detail_string() ) );                    \
+      throw;                                                                                    \
+   }                                                                                            \
+   catch( const boost::exception& e )                                                           \
+   {                                                                                            \
+      elog( "Caught plugin boost::exception: ${e}", ("e", boost::diagnostic_information(e) ) ); \
+   }                                                                                            \
+   catch( const std::exception& e )                                                             \
+   {                                                                                            \
+      elog( "Caught plugin std::exception: ${e}", ("e", e.what() ) );                           \
+   }                                                                                            \
+   catch( ... )                                                                                 \
+   {                                                                                            \
+      wlog( "Caught unexpected exception in plugin" );                                          \
    }
 
 namespace graphene { namespace chain {