mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-17 07:41:23 +01:00
clean up shutdown events
The shutdown function is called in exactly one place, and that place has a better log message, so we'll just delete the extra one.
This commit is contained in:
parent
12b0fb7f91
commit
601c2ed3e5
2 changed files with 2 additions and 4 deletions
|
|
@ -508,7 +508,7 @@ async fn shutdown_signal(handles: Vec<ServerHandle>) {
|
|||
() = terminate => { sig = "SIGTERM"; },
|
||||
}
|
||||
|
||||
warn!("Received {}, shutting down...", sig);
|
||||
warn!(signal = %sig, "shutting down due to signal");
|
||||
|
||||
services().globals.shutdown();
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ use ruma::{
|
|||
UserId,
|
||||
};
|
||||
use tokio::sync::{broadcast, Mutex, RwLock, Semaphore};
|
||||
use tracing::{error, info, Instrument};
|
||||
use tracing::{error, Instrument};
|
||||
use trust_dns_resolver::TokioAsyncResolver;
|
||||
|
||||
use crate::{api::server_server::FedDest, services, Config, Error, Result};
|
||||
|
|
@ -509,8 +509,6 @@ impl Service {
|
|||
|
||||
pub(crate) fn shutdown(&self) {
|
||||
self.shutdown.store(true, atomic::Ordering::Relaxed);
|
||||
// On shutdown
|
||||
info!(target: "shutdown-sync", "Received shutdown notification, notifying sync helpers...");
|
||||
services().globals.rotate.fire();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue