Skip to content

Commit

Permalink
Revert "fix(server): return err on WS handshake err (#1288)" (#1326)
Browse files Browse the repository at this point in the history
* Revert "fix(server): return err on WS handshake err (#1288)"

This reverts commit d9c4a5c.

* fix docs

* Update server/src/transport/ws.rs
  • Loading branch information
niklasad1 authored Mar 20, 2024
1 parent 5aa61c3 commit 1d5b08f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions server/src/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ impl StopHandle {
}
}

/// Error when the server has already been stopped.
#[derive(Debug, Copy, Clone, thiserror::Error)]
#[error("The server is already stopped")]
pub struct AlreadyStoppedError;
Expand Down
16 changes: 8 additions & 8 deletions server/src/transport/ws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,6 @@ where

match server.receive_request(&req) {
Ok(response) => {
let upgraded = match hyper::upgrade::on(req).await {
Ok(u) => u,
Err(e) => {
tracing::debug!(target: LOG_TARGET, "WS upgrade handshake failed: {}", e);
return Err(hyper::Response::new(hyper::Body::from(format!("WS upgrade handshake failed {e}"))));
}
};

let (tx, rx) = mpsc::channel::<String>(server_cfg.message_buffer_capacity as usize);
let sink = MethodSink::new(tx);

Expand All @@ -448,6 +440,14 @@ where
let rpc_service = rpc_middleware.service(rpc_service);

let fut = async move {
let upgraded = match hyper::upgrade::on(req).await {
Ok(u) => u,
Err(e) => {
tracing::debug!(target: LOG_TARGET, "WS upgrade handshake failed: {}", e);
return;
}
};

let stream = BufReader::new(BufWriter::new(upgraded.compat()));
let mut ws_builder = server.into_builder(stream);
ws_builder.set_max_message_size(server_cfg.max_response_body_size as usize);
Expand Down

0 comments on commit 1d5b08f

Please sign in to comment.