dandri/tetra-bluestation
1
0
Fork 0
mirror of https://github.com/MidnightBlueLabs/tetra-bluestation.git synced 2026-03-29 05:09:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimized out redundant BrewConfig struct

Browse Source 
Struct contents were nearly identical to CfgBrew from config.
Removed BrewConfig and updating passing config to Brew entity
This commit is contained in:
Wouter Bokslag
2026-02-23 17:15:52 +01:00
parent a24b931aff
commit d0e306cb78
5 changed files with 20 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bins/bluestation-bs/src/main.rs
View File

@@ -2,13 +2,11 @@ use clap::Parser;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::time::Duration;
use tetra_config::{PhyBackend, SharedConfig, StackMode, toml_config};
use tetra_core::{TdmaTime, debug};
use tetra_entities::MessageRouter;
use tetra_entities::brew::entity::BrewEntity;
use tetra_entities::brew::worker::BrewConfig;
use tetra_entities::{
cmce::cmce_bs::CmceBs,
llc::llc_bs_ms::Llc,
@@ -64,20 +62,8 @@ fn build_bs_stack(cfg: &mut SharedConfig) -> MessageRouter {
router.register_entity(Box::new(cmce));
// Register Brew entity if enabled
if let Some(brew_cfg) = cfg.config().brew.clone() {
let brew_config = BrewConfig {
host: brew_cfg.host,
port: brew_cfg.port,
tls: brew_cfg.tls,
username: brew_cfg.username,
password: brew_cfg.password,
issi: brew_cfg.issi,
reconnect_delay: Duration::from_secs(brew_cfg.reconnect_delay_secs),
jitter_initial_latency_frames: brew_cfg.jitter_initial_latency_frames,
whitelisted_ssi_ranges: brew_cfg.whitelisted_ssi_ranges,
blacklisted_ssi_ranges: brew_cfg.blacklisted_ssi_ranges,
};
let brew_entity = BrewEntity::new(cfg.clone(), brew_config);
if cfg.config().brew.is_some() {
let brew_entity = BrewEntity::new(cfg.clone());
router.register_entity(Box::new(brew_entity));
eprintln!(" -> Brew/TetraPack integration enabled");
}