Merge branch 'develop' into dp/on-demand-buildserver

This commit is contained in:
~dolled-possum 2024-06-11 13:57:44 -04:00
commit 13dcac3ab1

View File

@ -55,12 +55,12 @@ pub async fn register(
let tx = Arc::new(tx);
let ws_port = match ws_networking.0 {
Some(listener) => listener.local_addr().unwrap().port(),
Some(ref listener) => listener.local_addr().unwrap().port(),
None => 0,
};
let ws_flag_used = ws_networking.1;
let tcp_port = match tcp_networking.0 {
Some(listener) => listener.local_addr().unwrap().port(),
Some(ref listener) => listener.local_addr().unwrap().port(),
None => 0,
};
let tcp_flag_used = tcp_networking.1;
@ -258,6 +258,8 @@ pub async fn register(
let _ = open::that(format!("http://localhost:{}/", http_port));
warp::serve(routes)
.bind_with_graceful_shutdown(([0, 0, 0, 0], http_port), async {
drop(ws_networking.0);
drop(tcp_networking.0);
kill_rx.await.ok();
})
.1