From ee6db2e84d0a7ba31f9e4ad917e05790d7cd2834 Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Thu, 17 Sep 2020 15:58:40 -0700 Subject: [PATCH] Clean up the reconnect --- src/main.rs | 6 +++++- views/index.hbs | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 45e2a46..97ac35f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -102,13 +102,17 @@ async fn handle_websocket(peer_map: PeerMap, raw_stream: TcpStream, addr: Socket future::ready(!msg.is_close()) }) .try_for_each(|msg| { - println!( + info!( "Received a message from {}: {}", addr, msg.to_text().unwrap() ); let peers = peer_map.lock().unwrap(); + if let Ok(json) = serde_json::from_str::(msg.to_text().unwrap()) { + info!("JSON: {:?}", json); + } + // We want to broadcast the message to everyone except ourselves. let broadcast_recipients = peers .iter() diff --git a/views/index.hbs b/views/index.hbs index ab447c1..95d9ecc 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -77,11 +77,10 @@ socket.onerror = (err) => { console.error('😿 Websocket encountered an error:', err) socket.close() - wsConnect(socket.app) } socket.onclose = (event) => { - console.log('Websocketconnection lost, retrying..') - wsConnect(socket.app) + console.log('Websocket connection lost, retrying..') + setTimeout(() => { wsConnect(); }, 5000); } socket.onmessage = (event) => {