YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 10:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: use PanicSentinel

Browse source
This commit is contained in:
Joakim Frostegård 2022-04-06 00:42:11 +02:00
parent 49523779d9
commit d0eec05d4c
5 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
aquatic_udp/src/lib.rs
View file

@ -2,6 +2,7 @@ pub mod common;
pub mod config;
pub mod workers;
use aquatic_common::PanicSentinel;
use config::Config;
use std::collections::BTreeMap;
@ -14,7 +15,7 @@ use aquatic_common::privileges::PrivilegeDropper;
use crossbeam_channel::{bounded, unbounded};
use aquatic_common::access_list::update_access_list;
use signal_hook::consts::SIGUSR1;
use signal_hook::consts::{SIGTERM, SIGUSR1};
use signal_hook::iterator::Signals;
use common::{ConnectedRequestSender, ConnectedResponseSender, SocketWorkerIndex, State};
@ -29,7 +30,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
update_access_list(&config.access_list, &state.access_list)?;
let mut signals = Signals::new(::std::iter::once(SIGUSR1))?;
let mut signals = Signals::new([SIGUSR1, SIGTERM])?;
let priv_dropper = PrivilegeDropper::new(config.privileges.clone(), config.socket_workers);
@ -79,6 +80,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
);
workers::request::run_request_worker(
PanicSentinel,
config,
state,
request_receiver,
@ -109,6 +111,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
);
workers::socket::run_socket_worker(
PanicSentinel,
state,
config,
i,
@ -135,7 +138,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
WorkerIndex::Util,
);
workers::statistics::run_statistics_worker(config, state);
workers::statistics::run_statistics_worker(PanicSentinel, config, state);
})
.with_context(|| "spawn statistics worker")?;
}
@ -153,6 +156,9 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
SIGUSR1 => {
let _ = update_access_list(&config.access_list, &state.access_list);
}
SIGTERM => {
break;
}
_ => unreachable!(),
}
}