From 976d3fd4cc79cf26a363e1f0de486bf5b9b91e8c Mon Sep 17 00:00:00 2001
From: Weiliang Li <to.be.impressive@gmail.com>
Date: Tue, 10 Sep 2019 18:16:11 +0900
Subject: [PATCH] Fix authority-discovery cannot exit problem

---
 node/cli/src/service.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs
index 8522ce6d124a4..1ddb62128e82c 100644
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -178,7 +178,9 @@ macro_rules! new_full {
 				service.network(),
 				dht_event_rx,
 			);
-			service.spawn_task(Box::new(authority_discovery));
+			service.spawn_task(Box::new(authority_discovery.select(
+				service.on_exit()
+			).then(|_| Ok(()))));
 		}
 
 		let config = grandpa::Config {