mirror of
https://git.deuxfleurs.fr/Deuxfleurs/garage.git
synced 2024-11-13 11:41:07 +00:00
resolve domain to multiple addresses
And warn instead of failling when a domain can't be resolved
This commit is contained in:
parent
c8a7ce5cdf
commit
f17cb6c969
1 changed files with 17 additions and 10 deletions
|
@ -90,14 +90,21 @@ where
|
|||
{
|
||||
use std::net::ToSocketAddrs;
|
||||
|
||||
let mut res = vec![];
|
||||
for s in <Vec<&str>>::deserialize(deserializer)? {
|
||||
res.push(
|
||||
s.to_socket_addrs()
|
||||
.map_err(|_| de::Error::custom("could not resolve to a socket address"))?
|
||||
.next()
|
||||
.ok_or(de::Error::custom("could not resolve to a socket address"))?,
|
||||
);
|
||||
}
|
||||
Ok(res)
|
||||
Ok(<Vec<&str>>::deserialize(deserializer)?
|
||||
.iter()
|
||||
.filter_map(|&name| {
|
||||
name.to_socket_addrs()
|
||||
.map(|iter| (name, iter))
|
||||
.map_err(|_| warn!("Error resolving \"{}\"", name))
|
||||
.ok()
|
||||
})
|
||||
.map(|(name, iter)| {
|
||||
let v = iter.collect::<Vec<_>>();
|
||||
if v.is_empty() {
|
||||
warn!("Error resolving \"{}\"", name)
|
||||
}
|
||||
v
|
||||
})
|
||||
.flatten()
|
||||
.collect())
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue