rtyler
/
charcuterie
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up the reconnect

This commit is contained in:
R Tyler Croy 2020-09-17 15:58:40 -07:00
parent b1642167f4
commit ee6db2e84d
No known key found for this signature in database
GPG Key ID: E5C92681BEF6CEA2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -102,13 +102,17 @@ async fn handle_websocket(peer_map: PeerMap, raw_stream: TcpStream, addr: Socket
future::ready(!msg.is_close()) future::ready(!msg.is_close())
}) })
.try_for_each(|msg| { .try_for_each(|msg| {
println!( info!(
"Received a message from {}: {}", "Received a message from {}: {}",
addr, addr,
msg.to_text().unwrap() msg.to_text().unwrap()
); );
let peers = peer_map.lock().unwrap(); let peers = peer_map.lock().unwrap();
if let Ok(json) = serde_json::from_str::<serde_json::Value>(msg.to_text().unwrap()) {
info!("JSON: {:?}", json);
}
// We want to broadcast the message to everyone except ourselves. // We want to broadcast the message to everyone except ourselves.
let broadcast_recipients = peers let broadcast_recipients = peers
.iter() .iter()

5
views/index.hbs
View File

@ -77,11 +77,10 @@
socket.onerror = (err) => { socket.onerror = (err) => {
console.error('😿 Websocket encountered an error:', err) console.error('😿 Websocket encountered an error:', err)
socket.close() socket.close()
wsConnect(socket.app)
} }
socket.onclose = (event) => { socket.onclose = (event) => {
console.log('Websocketconnection lost, retrying..') console.log('Websocket connection lost, retrying..')
wsConnect(socket.app) setTimeout(() => { wsConnect(); }, 5000);
} }
socket.onmessage = (event) => { socket.onmessage = (event) => {