magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move systemd stopping notification point

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-04-02 04:12:24 +00:00
parent 45fd3875c8
commit 29d55b8036
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/server.rs
View file

@ -69,10 +69,6 @@ impl Server {
return Err!("Reloading not enabled"); return Err!("Reloading not enabled");
} }
#[cfg(all(feature = "systemd", target_os = "linux"))]
sd_notify::notify(true, &[sd_notify::NotifyState::Reloading])
.expect("failed to notify systemd of reloading state");
if self.reloading.swap(true, Ordering::AcqRel) { if self.reloading.swap(true, Ordering::AcqRel) {
return Err!("Reloading already in progress"); return Err!("Reloading already in progress");
} }
@ -98,10 +94,6 @@ impl Server {
} }
pub fn shutdown(&self) -> Result { pub fn shutdown(&self) -> Result {
#[cfg(all(feature = "systemd", target_os = "linux"))]
sd_notify::notify(true, &[sd_notify::NotifyState::Stopping])
.expect("failed to notify systemd of stopping state");
if self.stopping.swap(true, Ordering::AcqRel) { if self.stopping.swap(true, Ordering::AcqRel) {
return Err!("Shutdown already in progress"); return Err!("Shutdown already in progress");
} }
@ -144,7 +136,16 @@ impl Server {
} }
#[inline] #[inline]
pub fn running(&self) -> bool { !self.stopping.load(Ordering::Acquire) } pub fn running(&self) -> bool { !self.is_stopping() }
#[inline]
pub fn is_stopping(&self) -> bool { self.stopping.load(Ordering::Relaxed) }
#[inline]
pub fn is_reloading(&self) -> bool { self.reloading.load(Ordering::Relaxed) }
#[inline]
pub fn is_restarting(&self) -> bool { self.restarting.load(Ordering::Relaxed) }
#[inline] #[inline]
pub fn is_ours(&self, name: &str) -> bool { name == self.config.server_name } pub fn is_ours(&self, name: &str) -> bool { name == self.config.server_name }

4
src/router/run.rs
View file

@ -77,6 +77,10 @@ pub(crate) async fn start(server: Arc<Server>) -> Result<Arc<Services>> {
pub(crate) async fn stop(services: Arc<Services>) -> Result<()> { pub(crate) async fn stop(services: Arc<Services>) -> Result<()> {
debug!("Shutting down..."); debug!("Shutting down...");
#[cfg(all(feature = "systemd", target_os = "linux"))]
sd_notify::notify(true, &[sd_notify::NotifyState::Stopping])
.expect("failed to notify systemd of stopping state");
// Wait for all completions before dropping or we'll lose them to the module // Wait for all completions before dropping or we'll lose them to the module
// unload and explode. // unload and explode.
services.stop().await; services.stop().await;