Fix Compile Errors

anza-xyz · Jan 13, 2025 · ae146f6 · ae146f6
1 parent db73fdf
commit ae146f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/pubsub-client/src/nonblocking/pubsub_client.rs b/pubsub-client/src/nonblocking/pubsub_client.rs
@@ -167,13 +167,13 @@
 //! ```
 
 use {
+    crate::pubsub_client::{DEFAULT_MAX_FAILED_PINGS, DEFAULT_PING_DURATION_SECONDS},
     futures_util::{
         future::{ready, BoxFuture, FutureExt},
         sink::SinkExt,
         stream::{BoxStream, StreamExt},
     },
     log::*,
-    pubsub_client::{DEFAULT_MAX_FAILED_PINGS, DEFAULT_PING_DURATION_SECONDS},
     serde::de::DeserializeOwned,
     serde_json::{json, Map, Value},
     solana_account_decoder_client_types::UiAccount,

diff --git a/pubsub-client/src/pubsub_client.rs b/pubsub-client/src/pubsub_client.rs
@@ -837,14 +837,18 @@ impl PubsubClient {
                 }
             }
 
-            // Read timeout to prevent indefinite blocking on `read_message`
-            socket
-                .write()
-                .unwrap()
-                .get_mut()
-                .get_mut()
-                .set_read_timeout(Some(Duration::from_millis(500)))
-                .unwrap();
+            let mut ws = socket.write().unwrap();
+            let maybe_tls_stream = ws.get_mut();
+
+            match maybe_tls_stream {
+                MaybeTlsStream::Plain(tcp_stream) => {
+                    if let Err(e) = tcp_stream.set_read_timeout(Some(Duration::from_millis(500))) {
+                        info!("Failed to set read timeout on TcpStream: {:?}", e);
+                    }
+                }
+                // We can only set a read time out safely if it's a plain TCP connection
+                _ => {}
+            }
 
             match PubsubClientSubscription::read_message(socket) {
                 Ok(Some(message)) => {