diff --git a/src/utils/kuberconsul.rs b/src/utils/kuberconsul.rs index 1ee5457..7b6b477 100644 --- a/src/utils/kuberconsul.rs +++ b/src/utils/kuberconsul.rs @@ -222,7 +222,7 @@ async fn clone_compare(upstreams: &UpstreamsDashMap, prev_upstreams: &UpstreamsD }; clone_dashmap_into(upstreams, prev_upstreams); clone_dashmap_into(upstreams, &tosend.upstreams); - print_upstreams(&tosend.upstreams); + print_upstreams(&tosend.upstreams, &tosend.extraparams); return Some(tosend); }; None diff --git a/src/utils/parceyaml.rs b/src/utils/parceyaml.rs index 0180285..4386417 100644 --- a/src/utils/parceyaml.rs +++ b/src/utils/parceyaml.rs @@ -233,7 +233,7 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) { clone_dashmap_into(&r, &config.upstreams); } info!("Upstream Config:"); - print_upstreams(&config.upstreams); + print_upstreams(&config.upstreams, &config.extraparams); } } pub fn parce_main_config(path: &str) -> AppConfig { diff --git a/src/utils/tools.rs b/src/utils/tools.rs index 0fcc199..d7fb120 100644 --- a/src/utils/tools.rs +++ b/src/utils/tools.rs @@ -1,6 +1,6 @@ use crate::tls::load; use crate::tls::load::CertificateConfig; -use crate::utils::structs::{InnerMap, InnerMapForJson, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap}; +use crate::utils::structs::{InnerMap, InnerMapForJson, Extraparams, UpstreamSnapshotForJson, UpstreamsDashMap, UpstreamsIdMap}; use dashmap::DashMap; use log::{error, info}; use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; @@ -20,7 +20,7 @@ use std::sync::Arc; use std::time::{Duration, Instant}; use std::{fs, process, thread, time}; -pub fn print_upstreams(upstreams: &UpstreamsDashMap) { +pub fn print_upstreams(upstreams: &UpstreamsDashMap, extraparams: &Extraparams) { let mut out = String::new(); for host_entry in upstreams.iter() { writeln!(out, "Hostname: {}", host_entry.key()).unwrap(); @@ -35,8 +35,8 @@ pub fn print_upstreams(upstreams: &UpstreamsDashMap) { f.is_ssl, f.is_http2, f.to_https, - f.rate_limit.unwrap_or(0), - f.x4xx_limit.unwrap_or(0) + f.rate_limit.unwrap_or(extraparams.rate_limit.unwrap_or(0)), + f.x4xx_limit.unwrap_or(extraparams.x4xx_limit.unwrap_or(0)) ) .unwrap(); }