Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add exception handling to to_string and to_detail_string

Browse source
This commit is contained in:
Kevin Heifner 2018-05-22 10:59:42 -04:00 committed by Peter Conrad
parent d729816b06
commit 2eb047a6f4
1 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/exception.cpp
View file

@ -183,9 +183,17 @@ namespace fc
string exception::to_detail_string( log_level ll )const string exception::to_detail_string( log_level ll )const
{ {
std::stringstream ss; std::stringstream ss;
ss << variant(my->_code).as_string() <<" " << my->_name << ": " <<my->_what<<"\n"; try {
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) try {
{ ss << variant( my->_code ).as_string();
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_detail_string.";
}
ss << " " << my->_name << ": " << my->_what << "\n";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) {
try {
ss << itr->get_message() <<"\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n"; ss << itr->get_message() <<"\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n";
try try
{ {
@ -197,8 +205,18 @@ namespace fc
} }
ss << " " << itr->get_context().to_string(); ss << " " << itr->get_context().to_string();
++itr; ++itr;
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_detail_string.";
}
if( itr != my->_elog.end() ) ss<<"\n"; if( itr != my->_elog.end() ) ss<<"\n";
} }
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_detail_string.\n";
}
return ss.str(); return ss.str();
} }
@ -208,13 +226,31 @@ namespace fc
string exception::to_string( log_level ll )const string exception::to_string( log_level ll )const
{ {
std::stringstream ss; std::stringstream ss;
ss << what() << " (" << variant(my->_code).as_string() <<")\n"; try {
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) ss << my->_what;
{ try {
ss << " (" << variant( my->_code ).as_string() << ")\n";
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) {
try {
ss << fc::format_string( itr->get_format(), itr->get_data() ) << "\n"; ss << fc::format_string( itr->get_format(), itr->get_data() ) << "\n";
// ss << " " << itr->get_context().to_string() <<"\n"; // ss << " " << itr->get_context().to_string() <<"\n";
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
} }
return ss.str(); return ss.str();
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
} }
[[noreturn]] void exception_factory::rethrow( const exception& e )const [[noreturn]] void exception_factory::rethrow( const exception& e )const