Skip to content

fix(pb, tunnel, gateway): refactor error handling #3149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(pb, tunnel, gateway): refactor error handling #3149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/core/guard/core/src/proxy_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,10 +944,10 @@ impl ProxyService {
if !err.is_connect() || attempts >= max_attempts {
tracing::error!(?err, "Request error after {} attempts", attempts);
return Err(errors::UpstreamError(
"failed to connect to runner. Make sure your runners are healthy and the provided runner address is reachable by Rivet."
.to_string(),
)
.build());
"failed to connect to runner. Make sure your runners are healthy and the provided runner address is reachable by Rivet."
.to_string(),
)
.build());
} else {
// Request connect error, might retry
tracing::debug!(?err, "Request attempt {attempts} failed");
Expand Down Expand Up @@ -2327,7 +2327,7 @@ fn err_to_close_frame(err: anyhow::Error) -> CloseFrame {
.unwrap_or_else(|| RivetError::from(&INTERNAL_ERROR));

let code = match (rivet_err.group(), rivet_err.code()) {
("ws", "connection_closed") => CloseCode::Normal,
("ws", "connection_closed") | ("ws", "eviction") => CloseCode::Normal,
_ => CloseCode::Error,
};

Expand Down
1 change: 0 additions & 1 deletion packages/core/guard/server/src/routing/pegboard_gateway.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ pub async fn route_request(

// Return pegboard-gateway instance
let gateway = pegboard_gateway::PegboardGateway::new(
ctx.clone(),
shared_state.pegboard_gateway.clone(),
runner_id,
actor_id,
Expand Down
3 changes: 2 additions & 1 deletion packages/core/pegboard-gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ http-body-util.workspace = true
hyper = "1.6"
hyper-tungstenite.workspace = true
pegboard.workspace = true
rivet-runner-protocol.workspace = true
rand.workspace = true
rivet-error.workspace = true
rivet-guard-core.workspace = true
rivet-runner-protocol.workspace = true
rivet-util.workspace = true
serde.workspace = true
thiserror.workspace = true
tokio-tungstenite.workspace = true
tokio.workspace = true
Expand Down
Loading
Loading