From a98c10045ea6fc81934f1deece656e20c81ad1e6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 17 Aug 2021 00:43:54 +0100 Subject: [PATCH] server: reorganise setup Signed-off-by: Ian Jackson --- src/bin/server.rs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/bin/server.rs b/src/bin/server.rs index 297740a..cabd18c 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -433,23 +433,26 @@ async fn main() { )).unzip::<_,_,Vec<_>,Vec<_>>(); let all_clients = izip!( - ics.into_iter(), + ics.iter(), client_handles_send, - client_handles_recv, - ).map(|(ic, web_send, web_recv)| { - let r = (ic.link.client, - Client { - ic: ic.clone(), - web: web_send, - }); + ).map(|(ic, web_send)| { + (ic.link.client, + Client { + ic: ic.clone(), + web: web_send, + }) + }).collect(); + for (ic, web_recv) in izip!( + ics.into_iter(), + client_handles_recv, + ) { let ic_ = ic.clone(); tasks.push((tokio::spawn(async move { run_client(ic_, web_recv).await.void_unwrap_err() }), format!("client {}", &ic))); + } - r - }).collect(); let global = Arc::new(Global { config: global_config, all_clients, -- 2.30.2