perf: don't send messages when client is gone (#724)

paritytech · Apr 5, 2022 · fe53e5c · fe53e5c
1 parent ffdab3e
commit fe53e5c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/src/server/rpc_module.rs b/core/src/server/rpc_module.rs
@@ -911,12 +911,16 @@ impl SubscriptionSink {
 		self.inner_close(Some(close_reason));
 	}
 
-	fn inner_close(&mut self, close_reason: Option<&SubscriptionClosed>) {
+	fn inner_close(&mut self, maybe_close: Option<&SubscriptionClosed>) {
 		self.is_connected.take();
 		if let Some((sink, _)) = self.subscribers.lock().remove(&self.uniq_sub) {
-			tracing::debug!("Closing subscription: {:?} reason: {:?}", self.uniq_sub.sub_id, close_reason);
-			if let Some(close_reason) = close_reason {
-				let msg = self.build_message(close_reason).expect("valid json infallible; qed");
+			tracing::debug!("Closing subscription: {:?} reason: {:?}", self.uniq_sub.sub_id, maybe_close);
+
+			let closed_by_server =
+				maybe_close.map_or(false, |c| matches!(c.close_reason(), SubscriptionClosedReason::Server(_)));
+
+			if closed_by_server {
+				let msg = self.build_message(&maybe_close).expect("valid json infallible; qed");
 				let _ = sink.send_raw(msg);
 			}
 		}