Skip to content

refactor(server): replace transpose with match for request error hand… #358

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

Open
Alarak-Alex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(server): replace transpose with match for request error hand… #358

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
16 changes: 10 additions & 6 deletions src/server/rtu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,16 @@ where
S::Request: From<RequestAdu<'static>> + Send,
{
loop {
let Some(request_adu) = framed.next().await.transpose().inspect_err(|err| {
log::debug!("Failed to receive and decode request ADU: {err}");
})?
else {
log::debug!("Stream has finished");
break;
let request_adu = match framed.next().await {
Some(Ok(adu)) => adu,
Some(Err(err)) => {
log::debug!("Failed to receive and decode request ADU: {err}");
continue;
}
None => {
log::debug!("TCP socket has been closed");
Copy link

@sahil-boom sahil-boom Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log messaged should be "Stream has finished"

break;
}
};

let RequestAdu {
Expand Down
16 changes: 10 additions & 6 deletions src/server/rtu_over_tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,16 @@ where
T: AsyncRead + AsyncWrite + Unpin,
{
loop {
let Some(request_adu) = framed.next().await.transpose().inspect_err(|err| {
log::debug!("Failed to receive and decode request ADU: {err}");
})?
else {
log::debug!("TCP socket has been closed");
break;
let request_adu = match framed.next().await {
Some(Ok(adu)) => adu,
Some(Err(err)) => {
log::debug!("Failed to receive and decode request ADU: {err}");
continue;
}
None => {
log::debug!("TCP socket has been closed");
break;
}
};

let RequestAdu {
Expand Down
16 changes: 10 additions & 6 deletions src/server/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,16 @@ where
T: AsyncRead + AsyncWrite + Unpin,
{
loop {
let Some(request_adu) = framed.next().await.transpose().inspect_err(|err| {
log::debug!("Failed to receive and decode request ADU: {err}");
})?
else {
log::debug!("TCP socket has been closed");
break;
let request_adu = match framed.next().await {
Some(Ok(adu)) => adu,
Some(Err(err)) => {
log::debug!("Failed to receive and decode request ADU: {err}");
continue;
}
None => {
log::debug!("TCP socket has been closed");
break;
}
};

let RequestAdu {
Expand Down