validator: Multiple --entrypoint support (bp #14256) (#14264)

* Update entrypoint contact info even when shred version adoption is not requested

(cherry picked from commit 3373082ffa)

* Multiple entrypoint support

(cherry picked from commit ace360ade2)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-12-23 04:15:44 +00:00
committed by GitHub
parent ee716e1c55
commit 192cca8f98
7 changed files with 281 additions and 148 deletions

View File

@@ -113,7 +113,7 @@ fn do_verify_reachable_ports(
udp_retry_count: usize,
) -> bool {
info!(
"Checking that tcp ports {:?} from {:?}",
"Checking that tcp ports {:?} are reachable from {:?}",
tcp_listeners, ip_echo_server_addr
);
@@ -334,7 +334,7 @@ pub fn is_host(string: String) -> Result<(), String> {
pub fn parse_host_port(host_port: &str) -> Result<SocketAddr, String> {
let addrs: Vec<_> = host_port
.to_socket_addrs()
.map_err(|err| err.to_string())?
.map_err(|err| format!("Unable to resolve host {}: {}", host_port, err))?
.collect();
if addrs.is_empty() {
Err(format!("Unable to resolve host: {}", host_port))