From 69c92ecbdd58f72dd4b93b3391d7bf5c4b2965f6 Mon Sep 17 00:00:00 2001 From: Finomnis Date: Sat, 2 Nov 2024 01:11:22 +0100 Subject: [PATCH] Minor refactoring in example --- examples/tokio_console.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/tokio_console.rs b/examples/tokio_console.rs index 3dd2341..ada1e42 100644 --- a/examples/tokio_console.rs +++ b/examples/tokio_console.rs @@ -15,7 +15,15 @@ use tokio::time::{sleep, Duration}; use tokio_graceful_shutdown::{FutureExt, SubsystemBuilder, SubsystemHandle, Toplevel}; use tracing_subscriber::prelude::*; -async fn subsys(subsys: SubsystemHandle) -> Result<()> { +async fn child(subsys: SubsystemHandle) -> Result<()> { + sleep(Duration::from_millis(3000)) + .cancel_on_shutdown(&subsys) + .await + .ok(); + Ok(()) +} + +async fn parent(subsys: SubsystemHandle) -> Result<()> { tracing::info!("Parent started."); let mut iteration = 0; @@ -33,18 +41,10 @@ async fn subsys(subsys: SubsystemHandle) -> Result<()> { Ok(()) } -async fn child(subsys: SubsystemHandle) -> Result<()> { - sleep(Duration::from_millis(3000)) - .cancel_on_shutdown(&subsys) - .await - .ok(); - Ok(()) -} - #[tokio::main] async fn main() -> Result<()> { + // Init tokio-console server and tracing let console_layer = console_subscriber::spawn(); - // Init logging tracing_subscriber::registry() .with(console_layer) .with(tracing_subscriber::fmt::layer().compact()) @@ -52,7 +52,7 @@ async fn main() -> Result<()> { // Setup and execute subsystem tree Toplevel::new(|s| async move { - s.start(SubsystemBuilder::new("parent", subsys)); + s.start(SubsystemBuilder::new("parent", parent)); }) .catch_signals() .handle_shutdown_requests(Duration::from_millis(1000))