nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-14 23:19:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not panic on normal errors

Browse Source
This commit is contained in:
Greg Heartsfield 2021-11-20 21:33:35 -06:00
parent f9e30c194f
commit 097199ae6a
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.rs
View File

@ -1,17 +1,7 @@
//! A simple echo server.
//!
//! You can test this out by running:
//!
//! cargo run --example server 127.0.0.1:12345
//!
//! And then in another window run:
//!
//! cargo run --example client ws://127.0.0.1:12345/
use std::{env, io::Error};
use futures_util::{future, StreamExt, TryStreamExt};
use log::info;
use log::{info, warn};
use tokio::net::{TcpListener, TcpStream};
#[tokio::main]
@ -39,10 +29,10 @@ async fn accept_connection(stream: TcpStream) {
.expect("connected streams should have a peer address");
info!("Peer address: {}", addr);
let ws_stream = tokio_tungstenite::accept_async(stream)
.await
.expect("Error during the websocket handshake occurred");
let ws_stream_res = tokio_tungstenite::accept_async(stream).await;
match ws_stream_res {
Ok(ws_stream) => {
info!("New WebSocket connection: {}", addr);
let (write, read) = ws_stream.split();
@ -50,5 +40,11 @@ async fn accept_connection(stream: TcpStream) {
read.try_filter(|msg| future::ready(msg.is_text() || msg.is_binary()))
.forward(write)
.await
.expect("Failed to forward messages")
.unwrap_or_else(|_| warn!("Failed to forward message"));
}
Err(_) => {
println!("Error");
info!("Error during websocket handshake");
}
};
}