Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Avoid closing p2p node in exception handler

Browse source
This commit is contained in:
Eric Frias 2015-09-27 18:06:46 -04:00
parent c989c7dcac
commit 7ebd1d151f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
programs/witness_node/main.cpp
View file

@ -53,7 +53,8 @@ void write_default_logging_config_to_stream(std::ostream& out);
fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename); fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename);
int main(int argc, char** argv) { int main(int argc, char** argv) {
app::application* node = new app::application(); app::application* node = new app::application();
fc::oexception unhandled_exception;
try { try {
bpo::options_description app_options("Graphene Witness Node"); bpo::options_description app_options("Graphene Witness Node");
bpo::options_description cfg_options("Graphene Witness Node"); bpo::options_description cfg_options("Graphene Witness Node");
@ -173,7 +174,13 @@ int main(int argc, char** argv) {
delete node; delete node;
return 0; return 0;
} catch( const fc::exception& e ) { } catch( const fc::exception& e ) {
elog("Exiting with error:\n${e}", ("e", e.to_detail_string())); // deleting the node can yield, so do this outside the exception handler
unhandled_exception = e;
}
if (unhandled_exception)
{
elog("Exiting with error:\n${e}", ("e", unhandled_exception->to_detail_string()));
node->shutdown(); node->shutdown();
delete node; delete node;
return 1; return 1;