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

abstract shutdown/reload functionality.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-16 01:39:14 +00:00
parent 30e7298dd7
commit 08f2b8579c
6 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main/main.rs
View file

@ -4,11 +4,7 @@ mod server;
extern crate conduit_core as conduit;
use std::{
cmp,
sync::{atomic::Ordering, Arc},
time::Duration,
};
use std::{cmp, sync::Arc, time::Duration};
use conduit::{debug_error, debug_info, error, trace, utils::available_parallelism, warn, Error, Result};
use server::Server;
@ -107,7 +103,7 @@ async fn signal(server: Arc<Server>) {
use unix::SignalKind;
const CONSOLE: bool = cfg!(feature = "console");
const RELOADING: bool = cfg!(all(unix, debug_assertions, not(CONSOLE)));
const RELOADING: bool = cfg!(all(conduit_mods, not(CONSOLE)));
let mut quit = unix::signal(SignalKind::quit()).expect("SIGQUIT handler");
let mut term = unix::signal(SignalKind::terminate()).expect("SIGTERM handler");
@ -120,19 +116,17 @@ async fn signal(server: Arc<Server>) {
_ = term.recv() => { sig = "SIGTERM"; },
}
// Indicate the SIGINT is requesting a hot-reload.
if RELOADING && sig == "SIGINT" {
server.server.reloading.store(true, Ordering::Release);
}
// Indicate the signal is requesting a shutdown
if matches!(sig, "SIGQUIT" | "SIGTERM") || (!CONSOLE && sig == "SIGINT") {
server.server.stopping.store(true, Ordering::Release);
}
warn!("Received {sig}");
if let Err(e) = server.server.signal.send(sig) {
debug_error!("signal channel: {e}");
let result = if RELOADING && sig == "SIGINT" {
server.server.reload()
} else if matches!(sig, "SIGQUIT" | "SIGTERM") || (!CONSOLE && sig == "SIGINT") {
server.server.shutdown()
} else {
server.server.signal(sig)
};
if let Err(e) = result {
debug_error!(?sig, "signal: {e}");
}
}
}

1
src/main/mods.rs
View file

@ -39,6 +39,7 @@ pub(crate) async fn run(server: &Arc<Server>, starts: bool) -> Result<(bool, boo
return Err(error);
}
}
server.server.stopping.store(false, Ordering::Release);
let run = main_mod.get::<RunFuncProto>("run")?;
if let Err(error) = run(&server.server).await {
error!("Running server: {error}");