Detect if the background processor exits early and shutdown if so

src/main.rs

@@ -897,21 +897,30 @@ async fn start_ldk() {
 		Arc::clone(&channel_manager),
 	));
 
-	// Start the CLI.
-	cli::poll_for_user_input(
-		Arc::clone(&peer_manager),
-		Arc::clone(&channel_manager),
-		Arc::clone(&keys_manager),
-		Arc::clone(&network_graph),
-		Arc::clone(&onion_messenger),
-		inbound_payments,
-		outbound_payments,
-		ldk_data_dir,
-		network,
-		Arc::clone(&logger),
-		Arc::clone(&persister),
-	)
-	.await;
+	// Exit if CLI polling exits or the background processor exits (which shouldn't happen unless we
+	// fail to write to the filesystem).
+	tokio::select! {
+		_ = cli::poll_for_user_input(
+			Arc::clone(&peer_manager),
+			Arc::clone(&channel_manager),
+			Arc::clone(&keys_manager),
+			Arc::clone(&network_graph),
+			Arc::clone(&onion_messenger),
+			inbound_payments,
+			outbound_payments,
+			ldk_data_dir,
+			network,
+			Arc::clone(&logger),
+			Arc::clone(&persister),
+		) => {
+			// Disconnect our peers and stop accepting new connections. This ensures we don't continue
+			// updating our channel data after we've stopped the background processor.
+			bp_exit.send(()).unwrap();
+		},
+		bg_res = background_processor => {
+			println!("ERR: background processing stopped with result {:?}, exiting", bg_res);
+		},
+	}
 
 	// Disconnect our peers and stop accepting new connections. This ensures we don't continue
 	// updating our channel data after we've stopped the background processor.
@@ -920,7 +929,6 @@ async fn start_ldk() {
 
 	// Stop the background processor.
 	bp_exit.send(()).unwrap();
-	background_processor.await.unwrap().unwrap();
 }
 
 #[tokio::main]