aquatic_udp: pass less of state to tasks::update_access_list

This commit is contained in:
Joakim Frostegård 2021-10-18 02:46:58 +02:00
parent 253497bb74
commit 6b8616acf9
2 changed files with 5 additions and 4 deletions

View file

@ -23,7 +23,7 @@ pub const APP_NAME: &str = "aquatic_udp: UDP BitTorrent tracker";
pub fn run(config: Config) -> ::anyhow::Result<()> { pub fn run(config: Config) -> ::anyhow::Result<()> {
let state = State::default(); let state = State::default();
tasks::update_access_list(&config, &state); tasks::update_access_list(&config, &state.access_list);
let num_bound_sockets = start_workers(config.clone(), state.clone())?; let num_bound_sockets = start_workers(config.clone(), state.clone())?;
@ -55,7 +55,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
loop { loop {
::std::thread::sleep(Duration::from_secs(config.cleaning.interval)); ::std::thread::sleep(Duration::from_secs(config.cleaning.interval));
tasks::update_access_list(&config, &state); tasks::update_access_list(&config, &state.access_list);
state.torrents.lock().clean(&config, &state.access_list); state.torrents.lock().clean(&config, &state.access_list);
} }

View file

@ -1,3 +1,4 @@
use std::sync::Arc;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use histogram::Histogram; use histogram::Histogram;
@ -7,10 +8,10 @@ use aquatic_common::access_list::AccessListMode;
use crate::common::*; use crate::common::*;
use crate::config::Config; use crate::config::Config;
pub fn update_access_list(config: &Config, state: &State) { pub fn update_access_list(config: &Config, access_list: &Arc<AccessList>) {
match config.access_list.mode { match config.access_list.mode {
AccessListMode::White | AccessListMode::Black => { AccessListMode::White | AccessListMode::Black => {
if let Err(err) = state.access_list.update_from_path(&config.access_list.path) { if let Err(err) = access_list.update_from_path(&config.access_list.path) {
::log::error!("Update access list from path: {:?}", err); ::log::error!("Update access list from path: {:?}", err);
} }
} }