From 1d1a01c8aed90aedbac72f40940c22e00ad30d4c Mon Sep 17 00:00:00 2001
From: GroovieGermanikus <groovie@mango.markets>
Date: Mon, 29 Apr 2024 09:08:09 +0200
Subject: [PATCH] clarify await_or_exit behavior on channel close

---
 src/grpc_subscription_autoreconnect_tasks.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/grpc_subscription_autoreconnect_tasks.rs b/src/grpc_subscription_autoreconnect_tasks.rs
index c5727d4..f15741c 100644
--- a/src/grpc_subscription_autoreconnect_tasks.rs
+++ b/src/grpc_subscription_autoreconnect_tasks.rs
@@ -6,6 +6,7 @@ use std::time::Duration;
 use tokio::sync::mpsc::error::SendTimeoutError;
 use tokio::sync::mpsc::Receiver;
 use tokio::sync::broadcast;
+use tokio::sync::broadcast::error::RecvError;
 use tokio::task::JoinHandle;
 use tokio::time::{sleep, timeout, Instant};
 use yellowstone_grpc_client::{GeyserGrpcClient, GeyserGrpcClientError};
@@ -379,16 +380,27 @@ enum MaybeExit<T> {
     Exit,
 }
 
-async fn await_or_exit<F, E>(future: F, exit_notify: E) -> MaybeExit<F::Output>
+async fn await_or_exit<F, E, T>(future: F, exit_notify: E) -> MaybeExit<F::Output>
     where
         F: Future,
-        E: Future,
+        E: Future<Output = Result<T, RecvError>>,
 {
     tokio::select! {
         res = future => {
             MaybeExit::Continue(res)
         },
-        _ = exit_notify => {
+        res = exit_notify => {
+            match res {
+                Ok(_) => {
+                    debug!("exit on signal");
+                }
+                 Err(RecvError::Lagged(_)) => {
+                    warn!("exit on signal (lag)");
+                }
+                Err(RecvError::Closed) => {
+                    warn!("exit on signal (channel close)");
+                }
+            }
             MaybeExit::Exit
         }
     }