--gossip-host may now be specified with --entrypoint
This commit is contained in:
parent
9f95704706
commit
328f59ebef
|
@ -94,7 +94,7 @@ fn parse_matches() -> ArgMatches<'static> {
|
||||||
.value_name("HOST")
|
.value_name("HOST")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.validator(solana_net_utils::is_host)
|
.validator(solana_net_utils::is_host)
|
||||||
.help("Gossip DNS name or IP address for the node \
|
.help("Gossip DNS name or IP address for the node to advertise in gossip \
|
||||||
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
|
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
|
|
|
@ -1065,10 +1065,10 @@ pub fn main() {
|
||||||
.long("gossip-host")
|
.long("gossip-host")
|
||||||
.value_name("HOST")
|
.value_name("HOST")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.conflicts_with("entrypoint")
|
|
||||||
.validator(solana_net_utils::is_host)
|
.validator(solana_net_utils::is_host)
|
||||||
.help("IP address for the node to advertise in gossip when \
|
.help("Gossip DNS name or IP address for the node to advertise in gossip \
|
||||||
--entrypoint is not provided [default: 127.0.0.1]"),
|
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
|
||||||
|
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::with_name("public_rpc_addr")
|
Arg::with_name("public_rpc_addr")
|
||||||
|
@ -1647,21 +1647,27 @@ pub fn main() {
|
||||||
env::set_var("RUST_BACKTRACE", "1")
|
env::set_var("RUST_BACKTRACE", "1")
|
||||||
}
|
}
|
||||||
|
|
||||||
let gossip_host = if let Some(entrypoint_addr) = entrypoint_addr {
|
let gossip_host = matches
|
||||||
solana_net_utils::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
|
.value_of("gossip_host")
|
||||||
eprintln!(
|
.map(|gossip_host| {
|
||||||
"Failed to contact cluster entrypoint {}: {}",
|
solana_net_utils::parse_host(gossip_host).unwrap_or_else(|err| {
|
||||||
entrypoint_addr, err
|
eprintln!("Failed to parse --gossip-host: {}", err);
|
||||||
);
|
|
||||||
exit(1);
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
solana_net_utils::parse_host(matches.value_of("gossip_host").unwrap_or("127.0.0.1"))
|
|
||||||
.unwrap_or_else(|err| {
|
|
||||||
eprintln!("Error: {}", err);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
})
|
})
|
||||||
};
|
})
|
||||||
|
.unwrap_or_else(|| {
|
||||||
|
if let Some(entrypoint_addr) = entrypoint_addr {
|
||||||
|
solana_net_utils::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
|
||||||
|
eprintln!(
|
||||||
|
"Failed to contact cluster entrypoint {}: {}",
|
||||||
|
entrypoint_addr, err
|
||||||
|
);
|
||||||
|
exit(1);
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
std::net::IpAddr::V4(std::net::Ipv4Addr::new(127, 0, 0, 1))
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
let gossip_addr = SocketAddr::new(
|
let gossip_addr = SocketAddr::new(
|
||||||
gossip_host,
|
gossip_host,
|
||||||
|
|
Loading…
Reference in New Issue