talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(tonic): Expose h2 error instead of reason (#883)

Browse Source
This commit is contained in:
Robin Lambertz
2022-01-12 16:33:24 -05:00
committed by GitHub
parent 366d888a4b
commit a33e15a387
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic/src/status.rs
+4 -8
View File
@@ -325,7 +325,7 @@ impl Status {
#[cfg(feature = "transport")] #[cfg(feature = "transport")]
let err = match err.downcast::<h2::Error>() { let err = match err.downcast::<h2::Error>() {
Ok(h2) => { Ok(h2) => {
return Ok(Status::from_h2_error(&*h2)); return Ok(Status::from_h2_error(h2));
} }
Err(err) => err, Err(err) => err,
}; };
@@ -340,7 +340,7 @@ impl Status {
// FIXME: bubble this into `transport` and expose generic http2 reasons. // FIXME: bubble this into `transport` and expose generic http2 reasons.
#[cfg(feature = "transport")] #[cfg(feature = "transport")]
fn from_h2_error(err: &h2::Error) -> Status { fn from_h2_error(err: Box<h2::Error>) -> Status {
// See https://github.com/grpc/grpc/blob/3977c30/doc/PROTOCOL-HTTP2.md#errors // See https://github.com/grpc/grpc/blob/3977c30/doc/PROTOCOL-HTTP2.md#errors
let code = match err.reason() { let code = match err.reason() {
Some(h2::Reason::NO_ERROR) Some(h2::Reason::NO_ERROR)
@@ -359,11 +359,7 @@ impl Status {
}; };
let mut status = Self::new(code, format!("h2 protocol error: {}", err)); let mut status = Self::new(code, format!("h2 protocol error: {}", err));
let error = err status.source = Some(err);
.reason()
.map(h2::Error::from)
.map(|err| Box::new(err) as Box<dyn Error + Send + Sync + 'static>);
status.source = error;
status status
} }
@@ -632,7 +628,7 @@ fn invalid_header_value_byte<Error: fmt::Display>(err: Error) -> Status {
#[cfg(feature = "transport")] #[cfg(feature = "transport")]
impl From<h2::Error> for Status { impl From<h2::Error> for Status {
fn from(err: h2::Error) -> Self { fn from(err: h2::Error) -> Self {
Status::from_h2_error(&err) Status::from_h2_error(Box::new(err))
} }
} }