diff options
Diffstat (limited to 'server/src/network/register.rs')
| -rw-r--r-- | server/src/network/register.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/server/src/network/register.rs b/server/src/network/register.rs index 060994fe..101d96d1 100644 --- a/server/src/network/register.rs +++ b/server/src/network/register.rs @@ -19,10 +19,10 @@ use crate::server::Server; use anyhow::{Result, bail}; use hurrycurry_protocol::{VERSION, registry::Submission}; use log::{debug, error, info, warn}; +use rand::random; use reqwest::{Client, Url, header::USER_AGENT}; use std::{ net::{IpAddr, Ipv4Addr, Ipv6Addr}, - random::random, str::FromStr, sync::Arc, time::Duration, @@ -57,7 +57,7 @@ impl Register { registry_uri, players: 0, port, - secret: random(..), + secret: random(), state, ip4_client: if no4 { None @@ -108,7 +108,6 @@ impl Register { None } }); - #[rustfmt::skip] match tokio::join!(v4, v6) { (None, None) => info!("no registration sent"), (Some(Ok(())), None) => info!("Registration successful (IPv4)"), @@ -116,9 +115,15 @@ impl Register { (Some(Ok(())), Some(Ok(()))) => info!("Registration successful (IPv4 + IPv6)"), (Some(Err(e)), None) => error!("Registration failed (IPv4): {e}"), (None, Some(Err(e))) => error!("Registration failed (IPv6): {e}"), - (Some(Err(e1)), Some(Err(e2))) => error!("Registration failed (IPv4 + IPv6): {e1}, {e2}"), - (Some(Ok(())), Some(Err(e))) => warn!("Registration partially failed (IPv4 ok, IPv6 fail): {e}"), - (Some(Err(e)), Some(Ok(()))) => warn!("Registration partially failed (IPv4 fail, IPv6 ok): {e}"), + (Some(Err(e1)), Some(Err(e2))) => { + error!("Registration failed (IPv4 + IPv6): {e1}, {e2}") + } + (Some(Ok(())), Some(Err(e))) => { + warn!("Registration partially failed (IPv4 ok, IPv6 fail): {e}") + } + (Some(Err(e)), Some(Ok(()))) => { + warn!("Registration partially failed (IPv4 fail, IPv6 ok): {e}") + } } Ok(()) } |