geyser: do not disconnect if subscribe stream is closed (#140)

rpcpool · Jun 6, 2023 · 9c2b7ea · 9c2b7ea
1 parent 2030b31
commit 9c2b7ea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 members = [
     "examples/rust", # 1.2.0+solana.1.14.17
     "yellowstone-grpc-client", # 1.2.0+solana.1.14.17
-    "yellowstone-grpc-geyser", # 0.8.0+solana.1.14.17
+    "yellowstone-grpc-geyser", # 0.8.1+solana.1.14.17
     "yellowstone-grpc-proto", # 1.2.0+solana.1.14.17
 ]
 

diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-geyser"
-version = "0.8.0+solana.1.14.17"
+version = "0.8.1+solana.1.14.17"
 authors = ["Triton One"]
 edition = "2021"
 description = "Yellowstone gRPC Geyser Plugin"

diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
@@ -609,6 +609,7 @@ impl GrpcService {
                         }
                         ClientMessage::Drop { id } => {
                             if clients.remove(&id).is_some() {
+                                info!("{id}, client removed");
                                 CONNECTIONS_TOTAL.dec();
                             }
                         }
@@ -692,11 +693,15 @@ impl Geyser for GrpcService {
                                 .await;
                         }
                     }
-                    Ok(None) => break,
-                    Err(_error) => break,
+                    Ok(None) => {
+                        break;
+                    }
+                    Err(_error) => {
+                        let _ = new_clients_tx.send(ClientMessage::Drop { id });
+                        break;
+                    }
                 }
             }
-            let _ = new_clients_tx.send(ClientMessage::Drop { id });
         });
 
         Ok(Response::new(ReceiverStream::new(stream_rx)))