Add more logs to server process() loop

slowtec · Oct 16, 2024 · 97fb192 · 97fb192
1 parent 4823606
commit 97fb192
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 
 # Changelog
 
+## v0.16.0 (Unreleased)
+
+### Breaking Changes
+
+- Increased MSRV from 1.65 to 1.76
+
 ## v0.15.0 (2024-10-10)
 
 - Implement `Report Server ID` (function code 17).

diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ keywords = ["fieldbus", "modbus", "hardware", "automation"]
 homepage = "https://github.com/slowtec/tokio-modbus"
 repository = "https://github.com/slowtec/tokio-modbus"
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.76"
 include = ["/src", "/CHANGELOG.md", "/README.md", "/LICENSES"]
 
 [package.metadata.docs.rs]

diff --git a/src/server/rtu.rs b/src/server/rtu.rs
@@ -13,7 +13,7 @@ use crate::{
     codec::rtu::ServerCodec,
     frame::{
         rtu::{RequestAdu, ResponseAdu},
-        ExceptionResponse, OptionalResponsePdu,
+        ExceptionResponse, OptionalResponsePdu, RequestPdu,
     },
 };
 
@@ -78,15 +78,22 @@ where
     S::Request: From<RequestAdu<'static>> + Send,
 {
     loop {
-        let Some(request) = framed.next().await.transpose()? else {
+        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 fc = request.pdu.0.function_code();
-        let hdr = request.hdr;
+        let RequestAdu {
+            hdr,
+            pdu: RequestPdu(request),
+        } = &request_adu;
+        let hdr = *hdr;
+        let fc = request.function_code();
         let OptionalResponsePdu(Some(response_pdu)) = service
-            .call(request.into())
+            .call(request_adu.into())
             .await
             .map(Into::into)
             .map_err(|e| ExceptionResponse {
@@ -95,7 +102,7 @@ where
             })
             .into()
         else {
-            log::debug!("Sending no response for request {hdr:?}");
+            log::trace!("No response for request {hdr:?} (function = {fc})");
             continue;
         };
 
@@ -104,7 +111,10 @@ where
                 hdr,
                 pdu: response_pdu,
             })
-            .await?;
+            .await
+            .inspect_err(|err| {
+                log::debug!("Failed to send response for request {hdr:?} (function = {fc}): {err}");
+            })?;
     }
     Ok(())
 }
diff --git a/src/server/rtu_over_tcp.rs b/src/server/rtu_over_tcp.rs
@@ -18,7 +18,7 @@ use crate::{
     codec::rtu::ServerCodec,
     frame::{
         rtu::{RequestAdu, ResponseAdu},
-        ExceptionResponse, OptionalResponsePdu,
+        ExceptionResponse, OptionalResponsePdu, RequestPdu,
     },
 };
 
@@ -140,15 +140,22 @@ where
     T: AsyncRead + AsyncWrite + Unpin,
 {
     loop {
-        let Some(request) = framed.next().await.transpose()? else {
+        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 fc = request.pdu.0.function_code();
-        let hdr = request.hdr;
+        let RequestAdu {
+            hdr,
+            pdu: RequestPdu(request),
+        } = &request_adu;
+        let hdr = *hdr;
+        let fc = request.function_code();
         let OptionalResponsePdu(Some(response_pdu)) = service
-            .call(request.into())
+            .call(request_adu.into())
             .await
             .map(Into::into)
             .map_err(|e| ExceptionResponse {
@@ -157,7 +164,7 @@ where
             })
             .into()
         else {
-            log::trace!("Sending no response for request {hdr:?}");
+            log::trace!("No response for request {hdr:?} (function = {fc})");
             continue;
         };
 
@@ -166,7 +173,10 @@ where
                 hdr,
                 pdu: response_pdu,
             })
-            .await?;
+            .await
+            .inspect_err(|err| {
+                log::debug!("Failed to send response for request {hdr:?} (function = {fc}): {err}");
+            })?;
     }
 
     Ok(())

diff --git a/src/server/tcp.rs b/src/server/tcp.rs
@@ -18,7 +18,7 @@ use crate::{
     codec::tcp::ServerCodec,
     frame::{
         tcp::{RequestAdu, ResponseAdu},
-        ExceptionResponse, OptionalResponsePdu,
+        ExceptionResponse, OptionalResponsePdu, RequestPdu,
     },
 };
 
@@ -139,15 +139,22 @@ where
     T: AsyncRead + AsyncWrite + Unpin,
 {
     loop {
-        let Some(request) = framed.next().await.transpose()? else {
+        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 fc = request.pdu.0.function_code();
-        let hdr = request.hdr;
+        let RequestAdu {
+            hdr,
+            pdu: RequestPdu(request),
+        } = &request_adu;
+        let hdr = *hdr;
+        let fc = request.function_code();
         let OptionalResponsePdu(Some(response_pdu)) = service
-            .call(request.into())
+            .call(request_adu.into())
             .await
             .map(Into::into)
             .map_err(|e| ExceptionResponse {
@@ -156,7 +163,7 @@ where
             })
             .into()
         else {
-            log::trace!("Sending no response for request {hdr:?}");
+            log::trace!("No response for request {hdr:?} (function = {fc})");
             continue;
         };
 
@@ -165,7 +172,10 @@ where
                 hdr,
                 pdu: response_pdu,
             })
-            .await?;
+            .await
+            .inspect_err(|err| {
+                log::debug!("Failed to send response for request {hdr:?} (function = {fc}): {err}");
+            })?;
     }
 
     Ok(())