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

Merge pull request #18 from abitmore/bts2-bts-fix-dns-exception-rework

Browse source 
Catch DNS exceptions when adding seed nodes
This commit is contained in:
abitmore 2016-09-15 16:38:13 +02:00 committed by GitHub
commit 252e34a3e1
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
libraries/app/application.cpp
View file

@ -125,12 +125,17 @@ namespace detail {
auto seeds = _options->at("seed-node").as<vector<string>>(); auto seeds = _options->at("seed-node").as<vector<string>>();
for( const string& endpoint_string : seeds ) for( const string& endpoint_string : seeds )
{ {
std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string); try {
for (const fc::ip::endpoint& endpoint : endpoints) std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
{ for (const fc::ip::endpoint& endpoint : endpoints)
ilog("Adding seed node ${endpoint}", ("endpoint", endpoint)); {
_p2p_network->add_node(endpoint); ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
_p2p_network->connect_to_endpoint(endpoint); _p2p_network->add_node(endpoint);
_p2p_network->connect_to_endpoint(endpoint);
}
} catch( const fc::exception& e ) {
wlog( "caught exception ${e} while adding seed node ${endpoint}",
("e", e.to_detail_string())("endpoint", endpoint_string) );
} }
} }
} }
@ -141,11 +146,16 @@ namespace detail {
auto seeds = fc::json::from_string(seeds_str).as<vector<string>>(); auto seeds = fc::json::from_string(seeds_str).as<vector<string>>();
for( const string& endpoint_string : seeds ) for( const string& endpoint_string : seeds )
{ {
std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string); try {
for (const fc::ip::endpoint& endpoint : endpoints) std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
{ for (const fc::ip::endpoint& endpoint : endpoints)
ilog("Adding seed node ${endpoint}", ("endpoint", endpoint)); {
_p2p_network->add_node(endpoint); ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
_p2p_network->add_node(endpoint);
}
} catch( const fc::exception& e ) {
wlog( "caught exception ${e} while adding seed node ${endpoint}",
("e", e.to_detail_string())("endpoint", endpoint_string) );
} }
} }
} }
@ -172,11 +182,16 @@ namespace detail {
}; };
for( const string& endpoint_string : seeds ) for( const string& endpoint_string : seeds )
{ {
std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string); try {
for (const fc::ip::endpoint& endpoint : endpoints) std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
{ for (const fc::ip::endpoint& endpoint : endpoints)
ilog("Adding seed node ${endpoint}", ("endpoint", endpoint)); {
_p2p_network->add_node(endpoint); ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
_p2p_network->add_node(endpoint);
}
} catch( const fc::exception& e ) {
wlog( "caught exception ${e} while adding seed node ${endpoint}",
("e", e.to_detail_string())("endpoint", endpoint_string) );
} }
} }
} }