tensamin/iota
Watch
6
0
Fork
You've already forked iota
 0
Code Issues Pull requests 3 Projects Releases 1 Packages Wiki Activity Actions

[FIX] server no longer freezes main

Browse source
This commit is contained in:
Alex Emmet 2026-02-15 02:50:23 +01:00
commit ab1c36c9a0
2 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server/server.rs
View file

@ -25,10 +25,12 @@ async fn ws_handler(req: HttpRequest, stream: web::Payload) -> Result<impl Respo
ws::start(session, &req, stream)
}
pub async fn start(port: u16) -> bool {
let (tx, rx) = std::sync::mpsc::channel();
use tokio::sync::oneshot;
let server_task = tokio::spawn(async move {
pub async fn start(port: u16) -> bool {
let (tx, rx) = oneshot::channel::<ServerHandle>();
let _ = tokio::spawn(async move {
let server = match load_tls_config() {
Ok(Some(tls_config)) => {
log_message(format!("HTTPS (HTTP/2) Server running on 0.0.0.0:{}", port));
@ -72,13 +74,14 @@ pub async fn start(port: u16) -> bool {
log_message("Web Server shutdown complete.");
});
let server_handle = rx.recv().unwrap();
tokio::spawn(async move {
wait_for_shutdown(server_handle).await;
});
server_task.await.is_ok()
if let Ok(server_handle) = rx.await {
tokio::spawn(async move {
wait_for_shutdown(server_handle).await;
});
true
} else {
false
}
}
async fn wait_for_shutdown(server_handle: ServerHandle) {