Skip to content

Commit 5d0c806

Browse files
authored
fix some websocket server issues (#411)
One of these fixes an issue I introduced in my last PR. The other is pre-existing.
1 parent dae8947 commit 5d0c806

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

crates/y-sweet/src/server.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,10 @@ async fn handle_socket(
615615

616616
loop {
617617
tokio::select! {
618-
Some(msg) = recv.recv() => {
618+
msg = recv.recv() => {
619+
let Some(msg) = msg else {
620+
break;
621+
};
619622
let _ = sink.send(Message::Binary(msg)).await;
620623
}
621624
_ = ticker.tick() => {
@@ -637,7 +640,10 @@ async fn handle_socket(
637640

638641
loop {
639642
tokio::select! {
640-
Some(msg) = stream.next() => {
643+
msg = stream.next() => {
644+
let Some(msg) = msg else {
645+
break;
646+
};
641647
let msg = match msg {
642648
Ok(Message::Binary(bytes)) => bytes,
643649
Ok(Message::Close(_)) => break,

0 commit comments

Comments
 (0)