Skip to content

Commit 780499b

Browse files
Improved error reporting.
1 parent cb3b86c commit 780499b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ext/hyper_ruby/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ impl Server {
202202
if let Some(grpc_request) = GrpcRequest::new(hyper_request) {
203203
grpc_request.into_value()
204204
} else {
205-
warn!("Failed to create GrpcRequest");
205+
error!("Failed to create GrpcRequest due to invalid path - returning gRPC error");
206206
// Invalid gRPC request path
207207
let response = GrpcResponse::error(3_u32.into_value(), RString::new("Invalid gRPC request path")).unwrap()
208208
.into_hyper_response();
209-
work_request.response_tx.send(response).unwrap_or_else(|e| warn!("Failed to send response: {:?}", e));
209+
work_request.response_tx.send(response).unwrap_or_else(|e| error!("Failed to send response: {:?}", e));
210210
continue;
211211
}
212212
} else {
@@ -222,19 +222,19 @@ impl Server {
222222
} else if let Ok(http_response) = Obj::<Response>::try_convert(result) {
223223
(*http_response).clone().into_hyper_response()
224224
} else {
225-
warn!("Block returned invalid response type");
225+
error!("Block returned invalid response type - returning 500 Internal Server Error");
226226
create_error_response("Internal server error")
227227
}
228228
},
229229
Err(e) => {
230-
warn!("Block call failed: {:?}", e);
230+
error!("Block call failed with error: {:?} - returning 500 Internal Server Error", e);
231231
create_error_response("Internal server error")
232232
}
233233
};
234234

235235
match work_request.response_tx.send(hyper_response) {
236236
Ok(_) => (),
237-
Err(e) => warn!("Failed to send response: {:?}", e),
237+
Err(e) => error!("Failed to send response back to client: {:?} - response dropped", e),
238238
}
239239
}
240240
Err(_) => {
@@ -493,15 +493,15 @@ async fn handle_request(
493493
});
494494
},
495495
Ok(Err(crossbeam_channel::SendTimeoutError::Disconnected(_))) => {
496-
warn!("Worker channel disconnected");
496+
error!("Worker channel disconnected - server is shutting down, returning 500");
497497
return Ok(if is_grpc {
498498
grpc::create_grpc_error_response(500, 13, "Server shutting down")
499499
} else {
500500
create_error_response("Server shutting down")
501501
});
502502
},
503503
Err(_) => {
504-
warn!("Task to send request failed");
504+
error!("Task to send request failed - returning 500 Internal Server Error");
505505
return Ok(if is_grpc {
506506
grpc::create_grpc_error_response(500, 13, "Internal server error")
507507
} else {
@@ -511,7 +511,7 @@ async fn handle_request(
511511
}
512512
},
513513
Err(crossbeam_channel::TrySendError::Disconnected(_)) => {
514-
warn!("Worker channel disconnected");
514+
error!("Worker channel disconnected - server is shutting down, returning 500");
515515
return Ok(if is_grpc {
516516
grpc::create_grpc_error_response(500, 13, "Server shutting down")
517517
} else {
@@ -526,7 +526,7 @@ async fn handle_request(
526526
Ok(response)
527527
}
528528
Err(_) => {
529-
warn!("Failed to receive response from worker");
529+
error!("Failed to receive response from worker - returning 500 Internal Server Error");
530530
Ok(if is_grpc {
531531
grpc::create_grpc_error_response(500, 13, "Failed to get response")
532532
} else {

0 commit comments

Comments
 (0)