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

Changes to avoid conflict in following cherry-pick

Browse source
This commit is contained in:
Peter Conrad 2019-09-18 12:51:17 +02:00
parent bae416a446
commit d729816b06
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/exception.cpp
View file

@ -182,11 +182,11 @@ namespace fc
*/ */
string exception::to_detail_string( log_level ll )const string exception::to_detail_string( log_level ll )const
{ {
fc::stringstream ss; std::stringstream ss;
ss << variant(my->_code).as_string() <<" " << my->_name << ": " <<my->_what<<"\n"; ss << variant(my->_code).as_string() <<" " << my->_name << ": " <<my->_what<<"\n";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) for( auto itr = my->_elog.begin(); itr != my->_elog.end(); )
{ {
ss << itr->get_message() <<"\n"; ss << itr->get_message() <<"\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n";
try try
{ {
ss << " " << json::to_string( itr->get_data() )<<"\n"; ss << " " << json::to_string( itr->get_data() )<<"\n";
@ -207,12 +207,12 @@ namespace fc
*/ */
string exception::to_string( log_level ll )const string exception::to_string( log_level ll )const
{ {
fc::stringstream ss; std::stringstream ss;
ss << what() << ":"; ss << what() << " (" << variant(my->_code).as_string() <<")\n";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr )
{ {
if( itr->get_format().size() ) ss << fc::format_string( itr->get_format(), itr->get_data() ) << "\n";
ss << " " << fc::format_string( itr->get_format(), itr->get_data() ); // ss << " " << itr->get_context().to_string() <<"\n";
} }
return ss.str(); return ss.str();
} }