Merge pull request #194 from a-mpch/2025-01-reconnect-lnd

messenger: close server when lnd is killed
lndk-org · Jan 7, 2025 · 20f179e · 20f179e
2 parents f2c06d7 + 4283671
commit 20f179e
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/onion_messenger.rs b/src/onion_messenger.rs
@@ -199,11 +199,20 @@ impl LndkOnionMessenger {
         let peers_sender = sender.clone();
         let (peers_shutdown, peers_listener) = (signals.shutdown.clone(), signals.listener.clone());
         set.spawn(async move {
-            let peer_subscription = peers_client
+            let peer_subscription = match peers_client
                 .subscribe_peer_events(tonic_lnd::lnrpc::PeerEventSubscription {})
                 .await
-                .expect("peer subscription failed")
-                .into_inner();
+            {
+                Ok(response) => {
+                    info!("Connected to peer events subscription.");
+                    response.into_inner()
+                }
+                Err(e) => {
+                    peers_shutdown.trigger();
+                    error!("Error subscribing to peer events: {e}.");
+                    return;
+                }
+            };
 
             let peer_stream = PeerStream {
                 peer_subscription,
@@ -225,11 +234,20 @@ impl LndkOnionMessenger {
         let (messages_shutdown, messages_listener) =
             (signals.shutdown.clone(), signals.listener.clone());
         set.spawn(async move {
-            let message_subscription = messages_client
+            let message_subscription = match messages_client
                 .subscribe_custom_messages(tonic_lnd::lnrpc::SubscribeCustomMessagesRequest {})
                 .await
-                .expect("message subscription failed")
-                .into_inner();
+            {
+                Ok(response) => {
+                    info!("Connected to message subscription.");
+                    response.into_inner()
+                }
+                Err(e) => {
+                    messages_shutdown.trigger();
+                    error!("Error subscribing to message events: {e}.");
+                    return;
+                }
+            };
 
             let message_stream = MessageStream {
                 message_subscription,