aquatic_http access list: use in torrent cleaning, do periodic updates

This commit is contained in:
Joakim Frostegård 2021-10-15 23:03:24 +02:00
parent 7fec41099b
commit 10fe014c03
3 changed files with 29 additions and 9 deletions

View file

@ -40,7 +40,7 @@ pub fn run(config: Config) -> anyhow::Result<()> {
loop {
::std::thread::sleep(Duration::from_secs(config.cleaning.interval));
tasks::clean_torrents(&state);
tasks::clean_torrents(&config, &state);
}
}

View file

@ -1,20 +1,40 @@
use std::time::Instant;
use std::{ops::DerefMut, time::Instant};
use histogram::Histogram;
use crate::common::*;
use aquatic_common::access_list::{AccessList, AccessListMode};
pub fn clean_torrents(state: &State) {
use crate::{common::*, config::Config};
pub fn clean_torrents(config: &Config, state: &State) {
let mut torrent_maps = state.torrent_maps.lock();
let torrent_maps = torrent_maps.deref_mut();
clean_torrent_map(&mut torrent_maps.ipv4);
clean_torrent_map(&mut torrent_maps.ipv6);
match config.access_list.mode {
AccessListMode::Require | AccessListMode::Forbid => {
if let Err(err) = torrent_maps.access_list.update_from_path(&config.access_list.path) {
::log::error!("Couldn't update access list: {:?}", err);
}
},
AccessListMode::Ignore => { }
}
clean_torrent_map(config, &torrent_maps.access_list, &mut torrent_maps.ipv4);
clean_torrent_map(config, &torrent_maps.access_list, &mut torrent_maps.ipv6);
}
fn clean_torrent_map<I: Ip>(torrent_map: &mut TorrentMap<I>) {
fn clean_torrent_map<I: Ip>(
config: &Config,
access_list: &AccessList,
torrent_map: &mut TorrentMap<I>,
) {
let now = Instant::now();
torrent_map.retain(|_, torrent_data| {
torrent_map.retain(|info_hash, torrent_data| {
if !access_list.allows(config.access_list.mode, &info_hash.0) {
return false;
}
let num_seeders = &mut torrent_data.num_seeders;
let num_leechers = &mut torrent_data.num_leechers;