From 3d42e2c7ebbbc0addab3bb0fb8d2d9b5f04fc4fa Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Thu, 30 Jul 2020 17:59:07 +0200 Subject: [PATCH] Fix graceful shutdown skipped if future ends with error (#6769) * Initial commit Forked at: 5060324b91f178a34bc4f0d37964d1ac72ca08cb Parent branch: origin/master * Fix graceful shutdown skipped if future ends with error * apply suggestion --- substrate/client/cli/src/runner.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/substrate/client/cli/src/runner.rs b/substrate/client/cli/src/runner.rs index 219613e6bd..bdbf55eb83 100644 --- a/substrate/client/cli/src/runner.rs +++ b/substrate/client/cli/src/runner.rs @@ -229,10 +229,9 @@ impl Runner { ) -> Result<()> { self.print_node_infos(); let mut task_manager = initialise(self.config)?; - self.tokio_runtime.block_on(main(task_manager.future().fuse())) - .map_err(|e| e.to_string())?; + let res = self.tokio_runtime.block_on(main(task_manager.future().fuse())); self.tokio_runtime.block_on(task_manager.clean_shutdown()); - Ok(()) + res.map_err(|e| e.to_string().into()) } /// A helper function that runs a command with the configuration of this node