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

Move fn update_access_list to aquatic_common

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-02 23:33:47 +01:00
parent 446fd0b1f4
commit fa3b6bb259
5 changed files with 32 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

23
aquatic_udp/src/lib/glommio/mod.rs
View file

@ -1,6 +1,6 @@
use std::sync::{atomic::AtomicUsize, Arc};
use aquatic_common::access_list::AccessListQuery;
use aquatic_common::access_list::update_access_list;
use aquatic_common::privileges::drop_privileges_after_socket_binding;
use glommio::channels::channel_mesh::MeshBuilder;
use glommio::prelude::*;
@ -26,7 +26,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
let state = State::default();
update_access_list(&config, &state)?;
update_access_list(&config.access_list, &state.access_list)?;
let mut signals = Signals::new(::std::iter::once(SIGUSR1))?;
@ -40,7 +40,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
for signal in &mut signals {
match signal {
SIGUSR1 => {
let _ = update_access_list(&config, &state);
let _ = update_access_list(&config.access_list, &state.access_list);
}
_ => unreachable!(),
}
@ -128,20 +128,3 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
Ok(())
}
fn update_access_list(config: &Config, state: &State) -> anyhow::Result<()> {
if config.access_list.mode.is_on() {
match state.access_list.update(&config.access_list) {
Ok(()) => {
::log::info!("Access list updated")
}
Err(err) => {
::log::error!("Updating access list failed: {:#}", err);
return Err(err);
}
}
}
Ok(())
}

23
aquatic_udp/src/lib/mio/mod.rs
View file

@ -6,7 +6,7 @@ use anyhow::Context;
use aquatic_common::privileges::drop_privileges_after_socket_binding;
use crossbeam_channel::unbounded;
use aquatic_common::access_list::AccessListQuery;
use aquatic_common::access_list::update_access_list;
use signal_hook::consts::SIGUSR1;
use signal_hook::iterator::Signals;
@ -28,7 +28,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
let state = State::default();
update_access_list(&config, &state)?;
update_access_list(&config.access_list, &state.access_list)?;
let mut signals = Signals::new(::std::iter::once(SIGUSR1))?;
@ -42,7 +42,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
for signal in &mut signals {
match signal {
SIGUSR1 => {
let _ = update_access_list(&config, &state);
let _ = update_access_list(&config.access_list, &state.access_list);
}
_ => unreachable!(),
}
@ -146,20 +146,3 @@ pub fn run_inner(config: Config, state: State) -> ::anyhow::Result<()> {
state.torrents.lock().clean(&config, &state.access_list);
}
}
fn update_access_list(config: &Config, state: &State) -> anyhow::Result<()> {
if config.access_list.mode.is_on() {
match state.access_list.update(&config.access_list) {
Ok(()) => {
::log::info!("Access list updated")
}
Err(err) => {
::log::error!("Updating access list failed: {:#}", err);
return Err(err);
}
}
}
Ok(())
}