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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +20 -4
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fc61ef3d04 - Show all commits

16
src/thread/thread.cpp
View file

@ -80,12 +80,28 @@ namespace fc {
p->set_value(); p->set_value();
exec(); exec();
} catch ( fc::exception& e ) { } catch ( fc::exception& e ) {
if( !p->ready() )
{
wlog( "unhandled exception" ); wlog( "unhandled exception" );
p->set_exception( e.dynamic_copy_exception() ); p->set_exception( e.dynamic_copy_exception() );
}
else
{ // possibly shutdown?
std::cerr << "unhandled exception in thread '" << name << "'\n";
std::cerr << e.to_detail_string( log_level::warn );
}
} catch ( ... ) { } catch ( ... ) {
if( !p->ready() )
{
wlog( "unhandled exception" ); wlog( "unhandled exception" );
p->set_exception( std::make_shared<unhandled_exception>( FC_LOG_MESSAGE( warn, "unhandled exception: ${diagnostic}", ("diagnostic",boost::current_exception_diagnostic_information()) ) ) ); p->set_exception( std::make_shared<unhandled_exception>( FC_LOG_MESSAGE( warn, "unhandled exception: ${diagnostic}", ("diagnostic",boost::current_exception_diagnostic_information()) ) ) );
} }
else
{ // possibly shutdown?
std::cerr << "unhandled exception in thread '" << name << "'\n";
std::cerr << boost::current_exception_diagnostic_information() << "\n";
}
}
} ); } );
p->wait(); p->wait();
my->boost_thread = t; my->boost_thread = t;