Rename ShutdownManager to LifecycleManager

Author: sandhose

crates/cli/src/commands/server.rs

@@ -24,7 +24,7 @@ use tracing::{info, info_span, warn, Instrument};
 
 use crate::{
     app_state::AppState,
-    shutdown::ShutdownManager,
+    lifecycle::LifecycleManager,
     util::{
         database_pool_from_config, mailer_from_config, password_manager_from_config,
         policy_factory_from_config, site_config_from_config, templates_from_config,
@@ -56,7 +56,7 @@ impl Options {
     #[allow(clippy::too_many_lines)]
     pub async fn run(self, figment: &Figment) -> anyhow::Result<ExitCode> {
         let span = info_span!("cli.run.init").entered();
-        let mut shutdown = ShutdownManager::new()?;
+        let mut shutdown = LifecycleManager::new()?;
         let config = AppConfig::extract(figment)?;
 
         info!(version = crate::VERSION, "Starting up");

crates/cli/src/commands/worker.rs

@@ -14,7 +14,7 @@ use mas_router::UrlBuilder;
 use tracing::{info, info_span};
 
 use crate::{
-    shutdown::ShutdownManager,
+    lifecycle::LifecycleManager,
     util::{
         database_pool_from_config, mailer_from_config, site_config_from_config,
         templates_from_config,
@@ -26,7 +26,7 @@ pub(super) struct Options {}
 
 impl Options {
     pub async fn run(self, figment: &Figment) -> anyhow::Result<ExitCode> {
-        let shutdown = ShutdownManager::new()?;
+        let shutdown = LifecycleManager::new()?;
         let span = info_span!("cli.worker.init").entered();
         let config = AppConfig::extract(figment)?;
 

crates/cli/src/shutdown.rs renamed to crates/cli/src/lifecycle.rs

@@ -11,8 +11,8 @@ use mas_templates::Templates;
 use tokio::signal::unix::{Signal, SignalKind};
 use tokio_util::{sync::CancellationToken, task::TaskTracker};
 
-/// A helper to manage graceful shutdowns and track tasks that gracefully
-/// shutdown.
+/// A helper to manage the lifecycle of the service, inclusing handling graceful
+/// shutdowns and configuration reloads.
 ///
 /// It will listen for SIGTERM and SIGINT signals, and will trigger a soft
 /// shutdown on the first signal, and a hard shutdown on the second signal or
@@ -25,7 +25,10 @@ use tokio_util::{sync::CancellationToken, task::TaskTracker};
 ///
 /// They should also use the `task_tracker` to make it track things running, so
 /// that it knows when the soft shutdown is over and worked.
-pub struct ShutdownManager {
+///
+/// It also integrates with [`sd_notify`] to notify the service manager of the
+/// state of the service.
+pub struct LifecycleManager {
     hard_shutdown_token: CancellationToken,
     soft_shutdown_token: CancellationToken,
     task_tracker: TaskTracker,
@@ -68,7 +71,7 @@ fn notify(states: &[sd_notify::NotifyState]) {
     }
 }
 
-impl ShutdownManager {
+impl LifecycleManager {
     /// Create a new shutdown manager, installing the signal handlers
     ///
     /// # Errors

crates/cli/src/main.rs

@@ -18,8 +18,8 @@ use tracing_subscriber::{
 
 mod app_state;
 mod commands;
+mod lifecycle;
 mod server;
-mod shutdown;
 mod sync;
 mod telemetry;
 mod util;