Skip to content

Expose Error Status To Caller #1682

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

Merged
LucioFranco merged 3 commits into from
Jun 19, 2024
Merged

Expose Error Status To Caller #1682

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a0320e
Expose Error Status To Caller
zhixinwen Apr 11, 2024
ec44b56
clean
zhixinwen Apr 11, 2024
a513a09
Merge branch 'master' into zhixin/expose-error
LucioFranco Jun 19, 2024
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
10 changes: 5 additions & 5 deletions tonic/src/codec/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ struct StreamingInner {

impl<T> Unpin for Streaming<T> {}

#[derive(Debug, Clone, Copy)]
#[derive(Debug, Clone)]
enum State {
ReadHeader,
ReadBody {
compression: Option<CompressionEncoding>,
len: usize,
},
Error,
Error(Status),
}

#[derive(Debug, PartialEq, Eq)]
Expand Down Expand Up @@ -248,7 +248,7 @@ impl StreamingInner {
return Poll::Ready(Ok(None));
}

let _ = std::mem::replace(&mut self.state, State::Error);
let _ = std::mem::replace(&mut self.state, State::Error(status.clone()));
debug!("decoder inner stream error: {:?}", status);
return Poll::Ready(Err(status));
}
Expand Down Expand Up @@ -395,8 +395,8 @@ impl<T> Stream for Streaming<T> {

fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
loop {
if let State::Error = &self.inner.state {
return Poll::Ready(None);
if let State::Error(status) = &self.inner.state {
return Poll::Ready(Some(Err(status.clone())));
}

if let Some(item) = self.decode_chunk()? {
Expand Down