IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-24 17:20:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ui_stability' into lts2_client

Browse Source
This commit is contained in:
Herbert Wolverson 2024-10-09 13:11:16 -05:00
commit ed835ef621
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rust/lqosd/src/throughput_tracker/flow_data/mod.rs
View File

@ -9,13 +9,10 @@ mod flow_analysis;
use crate::throughput_tracker::flow_data::{flow_analysis::FinishedFlowAnalysis, netflow5::Netflow5, netflow9::Netflow9}; use crate::throughput_tracker::flow_data::{flow_analysis::FinishedFlowAnalysis, netflow5::Netflow5, netflow9::Netflow9};
pub(crate) use flow_tracker::{ALL_FLOWS, AsnId, FlowbeeLocalData}; pub(crate) use flow_tracker::{ALL_FLOWS, AsnId, FlowbeeLocalData};
use lqos_sys::flowbee_data::FlowbeeKey; use lqos_sys::flowbee_data::FlowbeeKey;
use std::sync::{ use std::sync::Arc;
mpsc::{channel, Sender},
Arc,
};
use tracing::{debug, error, info}; use tracing::{debug, error, info};
use anyhow::Result; use anyhow::Result;
use crossbeam_channel::Sender;
pub(crate) use flow_analysis::{setup_flow_analysis, get_asn_name_and_country, pub(crate) use flow_analysis::{setup_flow_analysis, get_asn_name_and_country,
FlowAnalysis, RECENT_FLOWS, flowbee_handle_events, get_flowbee_event_count_and_reset, FlowAnalysis, RECENT_FLOWS, flowbee_handle_events, get_flowbee_event_count_and_reset,
expire_rtt_flows, flowbee_rtt_map, RttData, get_rtt_events_per_second, AsnListEntry, expire_rtt_flows, flowbee_rtt_map, RttData, get_rtt_events_per_second, AsnListEntry,
@ -28,8 +25,9 @@ trait FlowbeeRecipient {
// Creates the netflow tracker and returns the sender // Creates the netflow tracker and returns the sender
pub fn setup_netflow_tracker() -> Result<Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>> { pub fn setup_netflow_tracker() -> Result<Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>> {
let (tx, rx) = channel::<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>(); let (tx, rx) = crossbeam_channel::bounded::<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>(65535);
let config = lqos_config::load_config().unwrap(); let config = lqos_config::load_config()
.inspect_err(|e| error!("Failed to load configuration: {e}"))?;
std::thread::Builder::new() std::thread::Builder::new()
.name("Netflow Tracker".to_string()) .name("Netflow Tracker".to_string())

4
src/rust/lqosd/src/throughput_tracker/mod.rs
View File

@ -43,7 +43,7 @@ pub static THROUGHPUT_TRACKER: Lazy<ThroughputTracker> = Lazy::new(ThroughputTra
/// collection thread that there is fresh data. /// collection thread that there is fresh data.
pub fn spawn_throughput_monitor( pub fn spawn_throughput_monitor(
long_term_stats_tx: Sender<StatsUpdateMessage>, long_term_stats_tx: Sender<StatsUpdateMessage>,
netflow_sender: std::sync::mpsc::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>, netflow_sender: crossbeam_channel::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
debug!("Starting the bandwidth monitor thread."); debug!("Starting the bandwidth monitor thread.");
std::thread::Builder::new() std::thread::Builder::new()
@ -107,7 +107,7 @@ impl ThroughputTaskTimeMetrics {
fn throughput_task( fn throughput_task(
long_term_stats_tx: Sender<StatsUpdateMessage>, long_term_stats_tx: Sender<StatsUpdateMessage>,
netflow_sender: std::sync::mpsc::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>, netflow_sender: crossbeam_channel::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>,
) { ) {
// Obtain the flow timeout from the config, default to 30 seconds // Obtain the flow timeout from the config, default to 30 seconds
let timeout_seconds = if let Ok(config) = lqos_config::load_config() { let timeout_seconds = if let Ok(config) = lqos_config::load_config() {

2
src/rust/lqosd/src/throughput_tracker/tracking_data.rs
View File

@ -201,7 +201,7 @@ impl ThroughputTracker {
&self, &self,
timeout_seconds: u64, timeout_seconds: u64,
_netflow_enabled: bool, _netflow_enabled: bool,
sender: std::sync::mpsc::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>, sender: crossbeam_channel::Sender<(FlowbeeKey, (FlowbeeLocalData, FlowAnalysis))>,
net_json_calc: &mut NetworkJsonCounting, net_json_calc: &mut NetworkJsonCounting,
) { ) {
//log::debug!("Flowbee events this second: {}", get_flowbee_event_count_and_reset()); //log::debug!("Flowbee events this second: {}", get_flowbee_event_count_and_reset());