blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Exit cleanly with error message when the user supplies a bad cluster entrypoint (#5947) 

automerge
This commit is contained in:
Michael Vines 2019-09-18 08:44:22 -07:00 committed by Grimes
parent 76223f5ae7
commit 92295dea4f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
validator/src/main.rs
View File

@ -487,7 +487,11 @@ fn main() {
let entrypoint_addr = solana_netutil::parse_host_port(entrypoint) let entrypoint_addr = solana_netutil::parse_host_port(entrypoint)
.expect("failed to parse entrypoint address"); .expect("failed to parse entrypoint address");
let ip_addr = solana_netutil::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| { let ip_addr = solana_netutil::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
panic!("Unable to contact entrypoint {}: {}", entrypoint_addr, err) eprintln!(
"Failed to contact cluster entrypoint {} ({}): {}",
entrypoint, entrypoint_addr, err
);
exit(1);
}); });
gossip_addr.set_ip(ip_addr); gossip_addr.set_ip(ip_addr);
@ -588,7 +592,10 @@ fn main() {
); );
if let Some(filename) = init_complete_file { if let Some(filename) = init_complete_file {
File::create(filename).unwrap_or_else(|_| panic!("Unable to create: {}", filename)); File::create(filename).unwrap_or_else(|_| {
eprintln!("Unable to create: {}", filename);
exit(1);
});
} }
info!("Validator initialized"); info!("Validator initialized");
validator.join().expect("validator exit"); validator.join().expect("validator exit");