fix: set default network timeout as config.connection_timeout_ms in…

…stead of zero
bytebeamio · Feb 26, 2025 · e13ccfb · e13ccfb
1 parent 49c3b5f
commit e13ccfb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/rumqttd/src/link/bridge.rs b/rumqttd/src/link/bridge.rs
@@ -172,6 +172,7 @@ async fn network_connect<P: Protocol>(
                 config.connections.max_payload_size,
                 config.connections.max_inflight_count,
                 protocol,
+                Duration::from_millis(config.connections.connection_timeout_ms as u64),
             ))
         }
         #[cfg(feature = "use-rustls")]
@@ -185,6 +186,7 @@ async fn network_connect<P: Protocol>(
                 config.connections.max_payload_size,
                 config.connections.max_inflight_count,
                 protocol,
+                Duration::from_millis(config.connections.connection_timeout_ms as u64),
             ))
         }
         #[cfg(not(feature = "use-rustls"))]

diff --git a/rumqttd/src/link/network.rs b/rumqttd/src/link/network.rs
@@ -48,14 +48,15 @@ impl<P: Protocol> Network<P> {
         max_incoming_size: usize,
         max_connection_buffer_len: usize,
         protocol: P,
+        keepalive: Duration,
     ) -> Network<P> {
         Network {
             socket,
             read: BytesMut::with_capacity(10 * 1024),
             write: BytesMut::with_capacity(10 * 1024),
             max_incoming_size,
             max_connection_buffer_len,
-            keepalive: Duration::ZERO,
+            keepalive,
             protocol,
         }
     }

diff --git a/rumqttd/src/server/broker.rs b/rumqttd/src/server/broker.rs
@@ -502,6 +502,7 @@ async fn remote<P: Protocol>(
         config.max_payload_size,
         config.max_inflight_count,
         protocol,
+        Duration::from_millis(config.connection_timeout_ms as u64),
     );
 
     let dynamic_filters = config.dynamic_filters;