wip
This commit is contained in:
Generated
+1
@@ -2195,6 +2195,7 @@ dependencies = [
|
|||||||
"eyre",
|
"eyre",
|
||||||
"log",
|
"log",
|
||||||
"mdns-sd",
|
"mdns-sd",
|
||||||
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -15,4 +15,5 @@ unwrap_used = "warn"
|
|||||||
eyre = { workspace = true }
|
eyre = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
mdns-sd = { workspace = true }
|
mdns-sd = { workspace = true }
|
||||||
|
tokio = { workspace = true }
|
||||||
tracing = { workspace = true }
|
tracing = { workspace = true }
|
||||||
|
|||||||
@@ -1268,7 +1268,10 @@ async fn run_server_component(
|
|||||||
format!("{truncated_hostname}-{peer_id}")
|
format!("{truncated_hostname}-{peer_id}")
|
||||||
};
|
};
|
||||||
|
|
||||||
let mdns = MdnsAdvertiser::new(LANSPREAD_SERVICE_TYPE, &combined_str, server_addr)?;
|
let mdns = tokio::task::spawn_blocking(move || {
|
||||||
|
MdnsAdvertiser::new(LANSPREAD_SERVICE_TYPE, &combined_str, server_addr)
|
||||||
|
})
|
||||||
|
.await??;
|
||||||
|
|
||||||
// Monitor mDNS events
|
// Monitor mDNS events
|
||||||
let _tx_notify_ui_mdns = tx_notify_ui.clone();
|
let _tx_notify_ui_mdns = tx_notify_ui.clone();
|
||||||
@@ -1651,11 +1654,10 @@ async fn run_peer_discovery(
|
|||||||
log::info!("Starting peer discovery task");
|
log::info!("Starting peer discovery task");
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let discovery_result =
|
let discovery_result = discover_service(LANSPREAD_SERVICE_TYPE);
|
||||||
tokio::task::spawn_blocking(|| discover_service(LANSPREAD_SERVICE_TYPE)).await;
|
|
||||||
|
|
||||||
match discovery_result {
|
match discovery_result {
|
||||||
Ok(Ok(peer_addr)) => {
|
Ok(peer_addr) => {
|
||||||
log::info!("Discovered peer at: {peer_addr}");
|
log::info!("Discovered peer at: {peer_addr}");
|
||||||
|
|
||||||
// Add peer to database
|
// Add peer to database
|
||||||
@@ -1692,12 +1694,8 @@ async fn run_peer_discovery(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Err(e)) => {
|
|
||||||
log::debug!("Peer discovery error: {e}");
|
|
||||||
tokio::time::sleep(Duration::from_secs(5)).await;
|
|
||||||
}
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Peer discovery join error: {e}");
|
log::debug!("Peer discovery error: {e}");
|
||||||
tokio::time::sleep(Duration::from_secs(5)).await;
|
tokio::time::sleep(Duration::from_secs(5)).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user