Performance improvement. String removal from hot paths.

Cargo.toml

@@ -11,9 +11,9 @@ panic = "abort"
 strip = true
 
 [dependencies]
-tokio = { version = "1.45.1", features = ["full"] }
+tokio = { version = "1.48.0", features = ["full"] }
 pingora = { version = "0.6.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl
-serde = { version = "1.0.219", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 dashmap = "7.0.0-rc2"
 pingora-core = "0.6.0"
 pingora-proxy = "0.6.0"
@@ -21,22 +21,22 @@ pingora-http = "0.6.0"
 pingora-limits = "0.6.0"
 async-trait = "0.1.89"
 env_logger = "0.11.8"
-log = "0.4.28"
+log = "0.4.29"
 futures = "0.3.31"
-notify = "8.2.0"
-axum = { version = "0.8.4" }
-axum-server = { version = "0.7.2", features = ["tls-openssl"] }
-reqwest = { version = "0.12.23", features = ["json", "native-tls-alpn", "stream"] }
+notify = "9.0.0-rc.1"
+axum = { version = "0.8.8" }
+axum-server = { version = "0.8.0", features = ["tls-openssl"] }
+reqwest = { version = "0.13.1", features = ["json", "stream"] }
 #reqwest = { version = "0.12.15", features = ["json", "rustls-tls"] }
 #reqwest = { version = "0.12.15", default-features = false, features = ["rustls-tls", "json"] }
 
 serde_yaml = "0.9.34-deprecated"
-rand = "0.9.2"
+rand = "0.10.0-rc.5"
 base64 = "0.22.1"
-jsonwebtoken = "9.3.1"
+jsonwebtoken = { version = "10.3.0", features = ["aws_lc_rs"] }
 tonic = "0.14.2"
-sha2 = { version = "0.11.0-rc.2", default-features = false }
-base16ct = { version = "0.3.0", features = ["alloc"] }
+sha2 = { version = "0.11.0-rc.3", default-features = false }
+base16ct = { version = "1.0.0", features = ["alloc"] }
 urlencoding = "2.1.3"
 arc-swap = "1.7.1"
 mimalloc = { version = "0.1.48", default-features = false }
@@ -44,12 +44,14 @@ prometheus = "0.14.0"
 lazy_static = "1.5.0"
 x509-parser = "0.18.0"
 rustls-pemfile = "2.2.0"
-tower-http = { version = "0.6.6", features = ["fs"] }
+tower-http = { version = "0.6.8", features = ["fs"] }
 once_cell = "1.21.3"
 privdrop = "0.5.6"
-ctrlc = "3.5.0"
+ctrlc = "3.5.1"
 port_check = "0.3.0"
-#moka = { version = "0.12.10", features = ["sync"] }
+serde_json = "1.0.149"
+http = "1.4.0"
+#moka = { version = "0.12.12", features = ["sync"] }
 #rustls = { version = "0.23.27", features = ["ring"] }
 #hickory-client = { version = "0.25.2" }
 #openssl = "0.10.73"

src/utils/auth.rs

@@ -3,6 +3,7 @@ use base64::engine::general_purpose::STANDARD;
 use base64::Engine;
 use pingora_proxy::Session;
 use std::collections::HashMap;
+use std::sync::Arc;
 use urlencoding::decode;
 
 trait AuthValidator {
@@ -56,18 +57,18 @@ fn validate(auth: &dyn AuthValidator, session: &Session) -> bool {
     auth.validate(session)
 }
 
-pub fn authenticate(c: &[String], session: &Session) -> bool {
-    match c[0].as_str() {
+pub fn authenticate(c: &[Arc<str>], session: &Session) -> bool {
+    match &*c[0] {
         "basic" => {
-            let auth = BasicAuth(c[1].as_str().into());
+            let auth = BasicAuth(&*c[1]);
             validate(&auth, session)
         }
         "apikey" => {
-            let auth = ApiKeyAuth(c[1].as_str().into());
+            let auth = ApiKeyAuth(&*c[1]);
             validate(&auth, session)
         }
         "jwt" => {
-            let auth = JwtAuth(c[1].as_str().into());
+            let auth = JwtAuth(&*c[1]);
             validate(&auth, session)
         }
         _ => {

src/utils/discovery.rs

@@ -1,6 +1,6 @@
 use crate::utils::filewatch;
 use crate::utils::kuberconsul::{ConsulDiscovery, KubernetesDiscovery, ServiceDiscovery};
-use crate::utils::structs::Configuration;
+use crate::utils::structs::{Configuration, UpstreamsDashMap};
 use crate::web::webserver;
 use async_trait::async_trait;
 use futures::channel::mpsc::Sender;
@@ -15,13 +15,8 @@ pub struct APIUpstreamProvider {
     pub tls_key_file: Option<String>,
     pub file_server_address: Option<String>,
     pub file_server_folder: Option<String>,
-}
-
-#[async_trait]
-impl Discovery for APIUpstreamProvider {
-    async fn start(&self, toreturn: Sender<Configuration>) {
-        webserver::run_server(self, toreturn).await;
-    }
+    pub current_upstreams: Arc<UpstreamsDashMap>,
+    pub full_upstreams: Arc<UpstreamsDashMap>,
 }
 
 pub struct FromFileProvider {
@@ -41,6 +36,13 @@ pub trait Discovery {
     async fn start(&self, tx: Sender<Configuration>);
 }
 
+#[async_trait]
+impl Discovery for APIUpstreamProvider {
+    async fn start(&self, toreturn: Sender<Configuration>) {
+        webserver::run_server(self, toreturn, self.current_upstreams.clone(), self.full_upstreams.clone()).await;
+    }
+}
+
 #[async_trait]
 impl Discovery for FromFileProvider {
     async fn start(&self, tx: Sender<Configuration>) {

src/utils/filewatch.rs

@@ -41,7 +41,7 @@ pub async fn start(fp: String, mut toreturn: Sender<Configuration>) {
                         if start.elapsed() > Duration::from_secs(2) {
                             start = Instant::now();
                             // info!("Config File changed :=> {:?}", e);
-                            let snd = load_configuration(file_path, "filepath").await;
+                            let snd = load_configuration(file_path, "filepath").await.0;
                             match snd {
                                 Some(snd) => {
                                     toreturn.send(snd).await.unwrap();

src/utils/healthcheck.rs

@@ -15,12 +15,18 @@ pub async fn hc2(upslist: Arc<UpstreamsDashMap>, fullist: Arc<UpstreamsDashMap>,
     loop {
         tokio::select! {
             _ = period.tick() => {
-                populate_upstreams(&upslist, &fullist, &idlist, params, &client).await;
+                // populate_upstreams(&upslist, &fullist, &idlist, params, &client).await;
+                let totest = build_upstreams(&fullist, params.0, &client).await;
+                if !compare_dashmaps(&totest, &upslist) {
+                    clone_dashmap_into(&totest, &upslist);
+                    clone_idmap_into(&totest, &idlist);
+                }
             }
         }
     }
 }
 
+/*
 pub async fn populate_upstreams(upslist: &Arc<UpstreamsDashMap>, fullist: &Arc<UpstreamsDashMap>, idlist: &Arc<UpstreamsIdMap>, params: (&str, u64), client: &Client) {
     let totest = build_upstreams(fullist, params.0, client).await;
     if !compare_dashmaps(&totest, upslist) {
@@ -28,6 +34,7 @@ pub async fn populate_upstreams(upslist: &Arc<UpstreamsDashMap>, fullist: &Arc<U
         clone_idmap_into(&totest, idlist);
     }
 }
+*/
 
 pub async fn initiate_upstreams(fullist: UpstreamsDashMap) -> UpstreamsDashMap {
     let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().unwrap();
@@ -71,23 +78,13 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Clie
                         if resp.1 {
                             scheme.is_http2 = is_h2; // could be adjusted further
                         }
-                        innervec.push(scheme);
+                        innervec.push(Arc::from(scheme));
                     } else {
                         warn!("Dead Upstream : {}", link);
                     }
                 } else {
-                    innervec.push(scheme);
+                    innervec.push(Arc::from(scheme));
                 }
-
-                // let resp = http_request(&link, method, "", &client).await;
-                // if resp.0 {
-                //     if resp.1 {
-                //         scheme.is_http2 = is_h2; // could be adjusted further
-                //     }
-                //     innervec.push(scheme);
-                // } else {
-                //     warn!("Dead Upstream : {}", link);
-                // }
             }
             inner.insert(path.clone(), (innervec, AtomicUsize::new(0)));
         }

src/utils/httpclient.rs

@@ -4,9 +4,10 @@ use axum::http::{HeaderMap, HeaderValue};
 use dashmap::DashMap;
 use reqwest::Client;
 use std::sync::atomic::AtomicUsize;
+use std::sync::Arc;
 use std::time::Duration;
 
-pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
+pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMapping) -> Option<DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>> {
     let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
     let mut headers = HeaderMap::new();
     if let Some(token) = token {
@@ -19,14 +20,14 @@ pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMappin
         return None;
     }
     let mut inner_vec = Vec::new();
-    let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
+    let upstreams: DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)> = DashMap::new();
     let endpoints: Vec<ConsulService> = resp.json().await.ok()?;
     for subsets in endpoints {
         // let addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone();
         // let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
         let addr = subsets.tagged_addresses.get("lan_ipv4").unwrap().address.clone().parse().unwrap();
         let prt = subsets.tagged_addresses.get("lan_ipv4").unwrap().port.clone();
-        let to_add = InnerMap {
+        let to_add = Arc::from(InnerMap {
             address: addr,
             port: prt,
             is_ssl: false,
@@ -34,14 +35,14 @@ pub async fn for_consul(url: String, token: Option<String>, conf: &ServiceMappin
             to_https: conf.to_https.unwrap_or(false),
             rate_limit: conf.rate_limit,
             healthcheck: None,
-        };
+        });
         inner_vec.push(to_add);
     }
     match_path(&conf, &upstreams, inner_vec.clone());
     Some(upstreams)
 }
 
-pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
+pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>> {
     let to = Duration::from_secs(10);
     let client = Client::builder().timeout(Duration::from_secs(10)).danger_accept_invalid_certs(true).build().ok()?;
     let resp = client.get(url).timeout(to).bearer_auth(token).send().await.ok()?;
@@ -50,14 +51,16 @@ pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<
         return None;
     }
     let endpoints: KubeEndpoints = resp.json().await.ok()?;
-    let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
+
+    let upstreams: DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)> = DashMap::new();
+
     if let Some(subsets) = endpoints.subsets {
         for subset in subsets {
             if let (Some(addresses), Some(ports)) = (subset.addresses, subset.ports) {
                 let mut inner_vec = Vec::new();
                 for addr in addresses {
                     for port in &ports {
-                        let to_add = InnerMap {
+                        let to_add = Arc::from(InnerMap {
                             address: addr.ip.parse().unwrap(),
                             port: port.port.clone(),
                             is_ssl: false,
@@ -65,7 +68,7 @@ pub async fn for_kuber(url: &str, token: &str, conf: &ServiceMapping) -> Option<
                             to_https: conf.to_https.unwrap_or(false),
                             rate_limit: conf.rate_limit,
                             healthcheck: None,
-                        };
+                        });
                         inner_vec.push(to_add);
                     }
                 }

src/utils/kuberconsul.rs

@@ -19,6 +19,10 @@ use std::time::Duration;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 
+// #[derive(Debug, Deserialize)]
+// pub struct KubeEndpointsList {
+//     pub items: Vec<KubeEndpoints>,
+// }
 #[derive(Debug, serde::Deserialize)]
 pub struct KubeEndpoints {
     pub subsets: Option<Vec<KubeSubset>>,
@@ -52,28 +56,28 @@ pub struct ConsulTaggedAddress {
     #[serde(rename = "Port")]
     pub port: u16,
 }
-pub fn list_to_upstreams(lt: Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>>, upstreams: &UpstreamsDashMap, i: &ServiceMapping) {
+pub fn list_to_upstreams(lt: Option<DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>>, upstreams: &UpstreamsDashMap, i: &ServiceMapping) {
     if let Some(list) = lt {
-        match upstreams.get(&i.hostname.clone()) {
+        match upstreams.get(&*i.hostname.clone()) {
             Some(upstr) => {
                 for (k, v) in list {
-                    upstr.value().insert(k, v);
+                    upstr.value().insert(Arc::from(k.to_owned()), v);
                 }
             }
             None => {
-                upstreams.insert(i.hostname.clone(), list);
+                upstreams.insert(Arc::from(i.hostname.clone()), list);
             }
         };
     }
 }
 
-pub fn match_path(conf: &ServiceMapping, upstreams: &DashMap<String, (Vec<InnerMap>, AtomicUsize)>, values: Vec<InnerMap>) {
+pub fn match_path(conf: &ServiceMapping, upstreams: &DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>, values: Vec<Arc<InnerMap>>) {
     match conf.path {
         Some(ref p) => {
-            upstreams.insert(p.to_string(), (values, AtomicUsize::new(0)));
+            upstreams.insert(Arc::from(p.clone()), (values, AtomicUsize::new(0)));
         }
         None => {
-            upstreams.insert("/".to_string(), (values, AtomicUsize::new(0)));
+            upstreams.insert(Arc::from("/"), (values, AtomicUsize::new(0)));
         }
     }
 }
@@ -114,12 +118,12 @@ impl ServiceDiscovery for KubernetesDiscovery {
                 let upstreams = UpstreamsDashMap::new();
                 if let Some(kuber) = config.kubernetes.clone() {
                     if let Some(svc) = kuber.services {
-                        for i in svc {
+                        for service in svc {
                             let header_list: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
                             let mut hl = Vec::new();
-                            build_headers(&i.client_headers, config.as_ref(), &mut hl);
+                            build_headers(&service.client_headers, config.as_ref(), &mut hl);
                             if !hl.is_empty() {
-                                match i.path.clone() {
+                                match service.path.clone() {
                                     Some(path) => {
                                         header_list.insert(Arc::from(path.as_str()), hl);
                                     }
@@ -130,11 +134,13 @@ impl ServiceDiscovery for KubernetesDiscovery {
 
                                 // header_list.insert(Arc::from(path.as_str()), hl);
                                 // header_list.insert(Arc::from(i.path).unwrap_or(Arc::from("/")).as_str(), hl);
-                                config.client_headers.insert(i.hostname.clone(), header_list);
+                                config.client_headers.insert(Arc::from(service.hostname.clone()), header_list);
                             }
-                            let url = format!("https://{}/api/v1/namespaces/{}/endpoints/{}", server, namespace, i.hostname);
-                            let list = httpclient::for_kuber(&*url, &*token, &i).await;
-                            list_to_upstreams(list, &upstreams, &i);
+                            let url = format!("https://{}/api/v1/namespaces/{}/endpoints/{}", server, namespace, service.hostname);
+                            // let url = format!("https://{}/api/v1/namespaces/{}/endpoints?labelSelector=app", server, namespace);
+                            let list = httpclient::for_kuber(&*url, &*token, &service).await;
+                            // println!("{:?}", list);
+                            list_to_upstreams(list, &upstreams, &service);
                         }
                     }
                     if let Some(lt) = clone_compare(&upstreams, &prev_upstreams, &config).await {
@@ -190,7 +196,7 @@ impl ServiceDiscovery for ConsulDiscovery {
                                 }
                             }
                             // header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
-                            config.client_headers.insert(i.hostname.clone(), header_list);
+                            config.client_headers.insert(Arc::from(i.hostname.clone()), header_list);
                         }
 
                         let pref = ss.clone() + &i.upstream;

src/utils/metrics.rs

@@ -1,9 +1,12 @@
+use http::method::Method;
 use pingora_http::Version;
 use prometheus::{register_histogram, register_int_counter, register_int_counter_vec, Histogram, IntCounter, IntCounterVec};
+use std::sync::Arc;
 use std::time::Duration;
 
 pub struct MetricTypes {
-    pub method: String,
+    pub method: Method,
+    pub upstream: Arc<str>,
     pub code: String,
     pub latency: Duration,
     pub version: Version,
@@ -33,6 +36,11 @@ lazy_static::lazy_static! {
         "Number of requests by HTTP method",
         &["method"]
     ).unwrap();
+    pub static ref REQUESTS_BY_UPSTREAM: IntCounterVec = register_int_counter_vec!(
+        "aralez_requests_by_upstream",
+        "Number of requests by UPSTREAM server",
+        &["method"]
+    ).unwrap();
     pub static ref REQUESTS_BY_VERSION: IntCounterVec = register_int_counter_vec!(
         "aralez_requests_by_version_total",
         "Number of requests by HTTP versions",
@@ -57,7 +65,8 @@ pub fn calc_metrics(metric_types: &MetricTypes) {
         _ => "Unknown",
     };
     REQUESTS_BY_VERSION.with_label_values(&[&version_str]).inc();
-    RESPONSE_CODES.with_label_values(&[&metric_types.code.to_string()]).inc();
+    RESPONSE_CODES.with_label_values(&[&metric_types.code]).inc();
     REQUESTS_BY_METHOD.with_label_values(&[&metric_types.method]).inc();
+    REQUESTS_BY_UPSTREAM.with_label_values(&[metric_types.upstream.as_ref()]).inc();
     RESPONSE_LATENCY.observe(metric_types.latency.as_secs_f64());
 }

src/utils/parceyaml.rs

@@ -10,7 +10,7 @@ use std::sync::Arc;
 use std::{env, fs};
 // use tokio::sync::oneshot::{Receiver, Sender};
 
-pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
+pub async fn load_configuration(d: &str, kind: &str) -> (Option<Configuration>, String) {
     let yaml_data = match kind {
         "filepath" => match fs::read_to_string(d) {
             Ok(data) => {
@@ -20,7 +20,7 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
             Err(e) => {
                 error!("Reading: {}: {:?}", d, e);
                 warn!("Running with empty upstreams list, update it via API");
-                return None;
+                return (None, e.to_string());
             }
         },
         "content" => {
@@ -29,7 +29,7 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
         }
         _ => {
             error!("Mismatched parameter, only filepath|content is allowed");
-            return None;
+            return (None, "Mismatched parameter, only filepath|content is allowed".to_string());
         }
     };
 
@@ -37,10 +37,9 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
         Ok(cfg) => cfg,
         Err(e) => {
             error!("Failed to parse upstreams file: {}", e);
-            return None;
+            return (None, e.to_string());
         }
     };
-
     let mut toreturn = Configuration::default();
 
     populate_headers_and_auth(&mut toreturn, &parsed).await;
@@ -49,19 +48,19 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
     match parsed.provider.as_str() {
         "file" => {
             populate_file_upstreams(&mut toreturn, &parsed).await;
-            Some(toreturn)
+            (Some(toreturn), "Ok".to_string())
         }
         "consul" => {
             toreturn.consul = parsed.consul;
-            toreturn.consul.is_some().then_some(toreturn)
+            (toreturn.consul.is_some().then_some(toreturn), "Ok".to_string())
         }
         "kubernetes" => {
             toreturn.kubernetes = parsed.kubernetes;
-            toreturn.kubernetes.is_some().then_some(toreturn)
+            (toreturn.kubernetes.is_some().then_some(toreturn), "Ok".to_string())
         }
         _ => {
             warn!("Unknown provider {}", parsed.provider);
-            None
+            (None, "Unknown provider".to_string())
         }
     }
 }
@@ -69,7 +68,6 @@ pub async fn load_configuration(d: &str, kind: &str) -> Option<Configuration> {
 async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
     let mut ch: Vec<(Arc<str>, Arc<str>)> = Vec::new();
     ch.push((Arc::from("Server"), Arc::from("Aralez")));
-    // println!("{:?}", &parsed.client_headers);
     if let Some(headers) = &parsed.client_headers {
         for header in headers {
             if let Some((key, val)) = header.split_once(':') {
@@ -79,7 +77,7 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     }
     let global_headers: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
     global_headers.insert(Arc::from("/"), ch);
-    config.client_headers.insert("GLOBAL_CLIENT_HEADERS".to_string(), global_headers);
+    config.client_headers.insert(Arc::from("GLOBAL_CLIENT_HEADERS"), global_headers);
 
     let mut sh: Vec<(Arc<str>, Arc<str>)> = Vec::new();
     sh.push((Arc::from("X-Proxy-Server"), Arc::from("Aralez")));
@@ -92,7 +90,7 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     }
     let server_global_headers: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
     server_global_headers.insert(Arc::from("/"), sh);
-    config.server_headers.insert("GLOBAL_SERVER_HEADERS".to_string(), server_global_headers);
+    config.server_headers.insert(Arc::from("GLOBAL_SERVER_HEADERS"), server_global_headers);
 
     config.extraparams.sticky_sessions = parsed.sticky_sessions;
     config.extraparams.to_https = parsed.to_https;
@@ -105,7 +103,10 @@ async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config)
     if let Some(auth) = &parsed.authorization {
         let name = auth.get("type").unwrap_or(&"".to_string()).to_string();
         let creds = auth.get("creds").unwrap_or(&"".to_string()).to_string();
-        config.extraparams.authentication.insert("authorization".to_string(), vec![name, creds]);
+        config
+            .extraparams
+            .authentication
+            .insert(Arc::from("authorization"), vec![Arc::from(name), Arc::from(creds)]);
     } else {
         config.extraparams.authentication = DashMap::new();
     }
@@ -134,7 +135,7 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
                 for server in &path_config.servers {
                     if let Some((ip, port_str)) = server.split_once(':') {
                         if let Ok(port) = port_str.parse::<u16>() {
-                            server_list.push(InnerMap {
+                            server_list.push(Arc::from(InnerMap {
                                 address: ip.trim().parse().unwrap(),
                                 port,
                                 is_ssl: true,
@@ -142,15 +143,15 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
                                 to_https: path_config.to_https.unwrap_or(false),
                                 rate_limit: path_config.rate_limit,
                                 healthcheck: path_config.healthcheck,
-                            });
+                            }));
                         }
                     }
                 }
-                path_map.insert(path.clone(), (server_list, AtomicUsize::new(0)));
+                path_map.insert(Arc::from(path.clone()), (server_list, AtomicUsize::new(0)));
             }
-            config.client_headers.insert(hostname.clone(), client_header_list);
-            config.server_headers.insert(hostname.clone(), server_header_list);
-            imtdashmap.insert(hostname.clone(), path_map);
+            config.client_headers.insert(Arc::from(hostname.clone()), client_header_list);
+            config.server_headers.insert(Arc::from(hostname.clone()), server_header_list);
+            imtdashmap.insert(Arc::from(hostname.clone()), path_map);
         }
 
         if is_first_run() {

src/utils/structs.rs

@@ -1,13 +1,14 @@
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::sync::atomic::AtomicUsize;
-pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
 use std::net::IpAddr;
+use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 
-pub type UpstreamsIdMap = DashMap<String, InnerMap>;
-pub type Headers = DashMap<String, DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>>;
+pub type UpstreamsDashMap = DashMap<Arc<str>, DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>>;
+
+pub type UpstreamsIdMap = DashMap<Arc<str>, Arc<InnerMap>>;
+pub type Headers = DashMap<Arc<str>, DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>>;
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub struct ServiceMapping {
@@ -20,13 +21,11 @@ pub struct ServiceMapping {
     pub server_headers: Option<Vec<String>>,
 }
 
-// pub type Services = DashMap<String, Vec<(String, Option<String>)>>;
-
 #[derive(Clone, Debug, Default)]
 pub struct Extraparams {
     pub sticky_sessions: bool,
     pub to_https: Option<bool>,
-    pub authentication: DashMap<String, Vec<String>>,
+    pub authentication: DashMap<Arc<str>, Vec<Arc<str>>>,
     pub rate_limit: Option<isize>,
 }
 #[derive(Clone, Default, Debug, Serialize, Deserialize)]
@@ -115,7 +114,7 @@ pub struct AppConfig {
     pub rungroup: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize)]
 pub struct InnerMap {
     pub address: IpAddr,
     pub port: u16,
@@ -140,3 +139,10 @@ impl InnerMap {
         }
     }
 }
+
+#[derive(Serialize)]
+pub struct UpstreamSnapshot {
+    pub backends: Vec<InnerMap>,
+    pub requests: usize,
+}
+// pub type UpstreamsSnapshot = HashMap<String, HashMap<String, UpstreamSnapshot>>;

src/utils/tools.rs

@@ -1,4 +1,4 @@
-use crate::utils::structs::{InnerMap, UpstreamsDashMap, UpstreamsIdMap};
+use crate::utils::structs::{InnerMap, UpstreamSnapshot, UpstreamsDashMap, UpstreamsIdMap};
 use crate::utils::tls;
 use crate::utils::tls::CertificateConfig;
 use dashmap::DashMap;
@@ -6,6 +6,7 @@ use log::{error, info};
 use notify::{event::ModifyKind, Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use port_check::is_port_reachable;
 use privdrop::PrivDrop;
+use serde_json::{json, Value};
 use sha2::{Digest, Sha256};
 use std::any::type_name;
 use std::collections::{HashMap, HashSet};
@@ -13,7 +14,7 @@ use std::fmt::Write;
 use std::net::SocketAddr;
 use std::os::unix::fs::MetadataExt;
 use std::str::FromStr;
-use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::{channel, Sender};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
@@ -168,8 +169,8 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
                     rate_limit: None,
                     healthcheck: None,
                 };
-                cloned.insert(id, to_add);
-                cloned.insert(hh, x.to_owned());
+                cloned.insert(Arc::from(id.as_str()), Arc::from(to_add));
+                cloned.insert(Arc::from(hh.as_str()), Arc::from(x.to_owned()));
             }
             new_inner_map.insert(path.clone(), new_vec);
         }
@@ -269,3 +270,75 @@ pub fn check_priv(addr: &str) {
         false => {}
     }
 }
+
+#[allow(dead_code)]
+pub fn upstreams_to_json(upstreams: &UpstreamsDashMap) -> serde_json::Result<String> {
+    let mut outer = HashMap::new();
+
+    for outer_entry in upstreams.iter() {
+        let mut inner_map = HashMap::new();
+
+        for inner_entry in outer_entry.value().iter() {
+            let (backends, counter) = inner_entry.value();
+
+            inner_map.insert(
+                inner_entry.key().to_string(),
+                UpstreamSnapshot {
+                    backends: backends.iter().map(|a| (**a).clone()).collect(),
+                    requests: counter.load(Ordering::Relaxed),
+                },
+            );
+        }
+
+        outer.insert(outer_entry.key().to_string(), inner_map);
+    }
+
+    // serde_json::to_string_pretty(&outer)
+    serde_json::to_string(&outer)
+}
+
+pub fn upstreams_liveness_json(configured: &UpstreamsDashMap, current: &UpstreamsDashMap) -> Value {
+    let mut result = serde_json::Map::new();
+
+    for host_entry in configured.iter() {
+        let hostname = host_entry.key().to_string();
+        let configured_paths = host_entry.value();
+
+        let mut paths_json = serde_json::Map::new();
+
+        for path_entry in configured_paths.iter() {
+            let path = path_entry.key().clone();
+            let (configured_backends, _) = path_entry.value();
+            let backends_json: Vec<Value> = configured_backends
+                .iter()
+                .map(|backend| {
+                    let alive = if let Some(host_map) = current.get(&*hostname) {
+                        if let Some(path_entry) = host_map.get(&*path) {
+                            let list = &path_entry.value().0; // Vec<Arc<InnerMap>>
+                            list.iter().any(|b| b.address == backend.address && b.port == backend.port)
+                        } else {
+                            false
+                        }
+                    } else {
+                        false
+                    };
+                    json!({
+                        "address": backend.address,
+                        "port": backend.port,
+                        "alive": alive
+                    })
+                })
+                .collect();
+
+            paths_json.insert(
+                path.to_string(),
+                json!({
+                    "backends": backends_json
+                }),
+            );
+        }
+
+        result.insert(hostname, Value::Object(paths_json));
+    }
+    Value::Object(result)
+}

src/web/bgservice.rs

@@ -21,6 +21,7 @@ impl BackgroundService for LB {
         let tx_api = tx.clone();
         let config = load_configuration(self.config.upstreams_conf.clone().as_str(), "filepath")
             .await
+            .0
             .expect("Failed to load configuration");
 
         match config.typecfg.as_str() {
@@ -58,6 +59,8 @@ impl BackgroundService for LB {
             tls_key_file: self.config.config_tls_key_file.clone(),
             file_server_address: self.config.file_server_address.clone(),
             file_server_folder: self.config.file_server_folder.clone(),
+            current_upstreams: self.ump_upst.clone(),
+            full_upstreams: self.ump_full.clone(),
         };
         // let tx_api = tx.clone();
         let _ = tokio::spawn(async move { api_load.start(tx_api).await });

src/web/gethosts.rs

@@ -12,15 +12,17 @@ pub struct GetHostsReturHeaders {
 
 #[async_trait]
 pub trait GetHost {
-    // fn get_host<'a>(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<&'a InnerMap>;
-
-    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<InnerMap>;
+    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<Arc<InnerMap>>;
 
     fn get_header(&self, peer: &str, path: &str) -> Option<GetHostsReturHeaders>;
+    // fn get_upstreams(&self) -> Arc<UpstreamsDashMap>;
 }
 #[async_trait]
 impl GetHost for LB {
-    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<InnerMap> {
+    // fn get_upstreams(&self) -> Arc<UpstreamsDashMap> {
+    //     self.ump_full.clone()
+    // }
+    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<Arc<InnerMap>> {
         if let Some(b) = backend_id {
             if let Some(bb) = self.ump_byid.get(b) {
                 return Some(bb.value().clone());

src/web/proxyhttp.rs

@@ -39,7 +39,7 @@ pub struct Context {
     redirect_to: Arc<str>,
     start_time: Instant,
     hostname: Option<Arc<str>>,
-    upstream_peer: Option<InnerMap>,
+    upstream_peer: Option<Arc<InnerMap>>,
     extraparams: arc_swap::Guard<Arc<Extraparams>>,
     client_headers: Arc<Vec<(Arc<str>, Arc<str>)>>,
 }
@@ -50,7 +50,6 @@ impl ProxyHttp for LB {
     fn new_ctx(&self) -> Self::CTX {
         Context {
             backend_id: Arc::from(""),
-            // backend_id: Arc::new((IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0, false)),
             to_https: false,
             redirect_to: Arc::from(""),
             start_time: Instant::now(),
@@ -61,10 +60,10 @@ impl ProxyHttp for LB {
         }
     }
     async fn request_filter(&self, session: &mut Session, _ctx: &mut Self::CTX) -> Result<bool> {
-        let ep = _ctx.extraparams.clone();
+        let ep = _ctx.extraparams.as_ref();
 
         if let Some(auth) = ep.authentication.get("authorization") {
-            let authenticated = authenticate(&auth.value(), &session);
+            let authenticated = authenticate(auth.value(), &session);
             if !authenticated {
                 let _ = session.respond_error(401).await;
                 warn!("Forbidden: {:?}, {}", session.client_addr(), session.req_header().uri.path());
@@ -72,7 +71,7 @@ impl ProxyHttp for LB {
             }
         };
 
-        let hostname = return_header_host(&session);
+        let hostname = return_header_host_from_upstream(session, &self.ump_upst);
         _ctx.hostname = hostname;
 
         let mut backend_id = None;
@@ -125,7 +124,7 @@ impl ProxyHttp for LB {
         match ctx.hostname.as_ref() {
             Some(hostname) => match ctx.upstream_peer.as_ref() {
                 Some(innermap) => {
-                    let mut peer = Box::new(HttpPeer::new((innermap.address.clone(), innermap.port.clone()), innermap.is_ssl, String::new()));
+                    let mut peer = Box::new(HttpPeer::new((innermap.address, innermap.port), innermap.is_ssl, String::new()));
                     if innermap.is_http2 {
                         peer.options.alpn = ALPN::H2;
                     }
@@ -137,13 +136,11 @@ impl ProxyHttp for LB {
                     if ctx.to_https || innermap.to_https {
                         if let Some(stream) = session.stream() {
                             if stream.get_ssl().is_none() {
-                                if let Some(addr) = session.server_addr() {
-                                    if let Some((host, _)) = addr.to_string().split_once(':') {
-                                        let uri = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
-                                        let port = self.config.proxy_port_tls.unwrap_or(403);
-                                        ctx.to_https = true;
-                                        ctx.redirect_to = Arc::from(format!("https://{}:{}{}", host, port, uri));
-                                    }
+                                if let Some(host) = ctx.hostname.as_ref() {
+                                    let uri = session.req_header().uri.path_and_query().map_or("/", |pq| pq.as_str());
+                                    let port = self.config.proxy_port_tls.unwrap_or(403);
+                                    ctx.to_https = true;
+                                    ctx.redirect_to = Arc::from(format!("https://{}:{}{}", host, port, uri));
                                 }
                             }
                         }
@@ -190,14 +187,12 @@ impl ProxyHttp for LB {
 
         if let Some(headers) = self.get_header(ctx.hostname.as_ref().unwrap_or(&Arc::from("localhost")), session.req_header().uri.path()) {
             if let Some(server_headers) = headers.server_headers {
-                for k in server_headers {
-                    upstream_request.insert_header(k.0.to_string(), k.1.as_ref())?;
+                for (k, v) in server_headers.iter() {
+                    upstream_request.insert_header(k.to_string(), v.as_ref())?;
                 }
             }
             if let Some(client_headers) = headers.client_headers {
-                let converted: Vec<(Arc<str>, Arc<str>)> = client_headers.into_iter().map(|(k, v)| (Arc::<str>::from(k), Arc::<str>::from(v))).collect();
-
-                ctx.client_headers = Arc::new(converted);
+                ctx.client_headers = Arc::new(client_headers);
             }
         }
 
@@ -205,8 +200,7 @@ impl ProxyHttp for LB {
     }
     async fn response_filter(&self, session: &mut Session, _upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
         if ctx.extraparams.sticky_sessions {
-            let backend_id = ctx.backend_id.clone();
-            if let Some(bid) = self.ump_byid.get(backend_id.as_ref()) {
+            if let Some(bid) = self.ump_byid.get(ctx.backend_id.as_ref()) {
                 let _ = _upstream_response.insert_header("set-cookie", format!("backend_id={}; Path=/; Max-Age=600; HttpOnly; SameSite=Lax", bid.address));
             }
         }
@@ -217,8 +211,8 @@ impl ProxyHttp for LB {
             session.write_response_header(Box::new(redirect_response), false).await?;
         }
 
-        for (key, value) in ctx.client_headers.iter() {
-            _upstream_response.insert_header(key.to_string(), value.as_ref()).unwrap();
+        for (k, v) in ctx.client_headers.iter() {
+            _upstream_response.insert_header(k.to_string(), v.as_ref())?;
         }
 
         session.set_keepalive(Some(300));
@@ -229,28 +223,67 @@ impl ProxyHttp for LB {
         let response_code = session.response_written().map_or(0, |resp| resp.status.as_u16());
         debug!("{}, response code: {response_code}", self.request_summary(session, ctx));
         let m = &MetricTypes {
-            method: session.req_header().method.to_string(),
+            method: session.req_header().method.clone(),
+            // method: Arc::from(session.req_header().method.as_str()),
             code: session.response_written().map(|resp| resp.status.as_str().to_owned()).unwrap_or("0".to_string()),
             latency: ctx.start_time.elapsed(),
             version: session.req_header().version,
+            upstream: ctx.hostname.clone().unwrap_or(Arc::from("localhost")),
         };
         calc_metrics(m);
     }
 }
 
-fn return_header_host(session: &Session) -> Option<Arc<str>> {
-    if session.is_http2() {
-        match session.req_header().uri.host() {
-            Some(host) => Option::from(Arc::from(host)),
-            None => None,
-        }
+// use moka::sync::Cache;
+// Using Moka for a high-concurrency, size-limited cache
+// static HOST_CACHE: Lazy<Cache<String, Arc<str>>> = Lazy::new(|| {
+//     Cache::builder()
+//         .max_capacity(10_000) // Limits memory usage if attacked
+//         .build()
+// });
+// fn return_header_host_cached(session: &Session) -> Option<Arc<str>> {
+//     let host_str = if session.is_http2() {
+//         session.req_header().uri.host()?
+//     } else {
+//         let h = session.req_header().headers.get("host")?.to_str().ok()?;
+//         h.split_once(':').map_or(h, |(host, _)| host)
+//     };
+//     HOST_CACHE
+//         .get_with(host_str.to_string(), || {
+//             Arc::from(host_str)
+//         })
+//         .into()
+// }
+
+// use dashmap::DashMap;
+// A simple cache to reuse Arcs for common hostnames
+// static HOST_CACHE: Lazy<DashMap<String, Arc<str>>> = Lazy::new(|| DashMap::with_capacity(200));
+//
+// fn return_header_host_cached(session: &Session) -> Option<Arc<str>> {
+//     let host_str = if session.is_http2() {
+//         session.req_header().uri.host()?
+//     } else {
+//         let h = session.req_header().headers.get("host")?.to_str().ok()?;
+//         h.split_once(':').map_or(h, |(host, _)| host)
+//     };
+//
+//     // Fast path: check if we already have an Arc for this host
+//     if let Some(arc) = HOST_CACHE.get(host_str) {
+//         return Some(arc.clone()); // Only an atomic increment!
+//     }
+//
+//     // Slow path: create new Arc and cache it
+//     let new_arc: Arc<str> = Arc::from(host_str);
+//     HOST_CACHE.insert(host_str.to_string(), new_arc.clone());
+//     Some(new_arc)
+// }
+
+fn return_header_host_from_upstream(session: &Session, ump_upst: &UpstreamsDashMap) -> Option<Arc<str>> {
+    let host_str = if session.is_http2() {
+        session.req_header().uri.host()?
     } else {
-        match session.req_header().headers.get("host") {
-            Some(host) => {
-                let header_host: &str = host.to_str().unwrap().split_once(':').map_or(host.to_str().unwrap(), |(h, _)| h);
-                Option::from(Arc::<str>::from(header_host))
-            }
-            None => None,
-        }
-    }
+        let h = session.req_header().headers.get("host")?.to_str().ok()?;
+        h.split_once(':').map_or(h, |(host, _)| host)
+    };
+    ump_upst.get(host_str).map(|entry| entry.key().clone())
 }

src/web/webserver.rs

@@ -1,5 +1,6 @@
 use crate::utils::discovery::APIUpstreamProvider;
-use crate::utils::structs::Configuration;
+use crate::utils::structs::{Config, Configuration, UpstreamsDashMap};
+use crate::utils::tools::{upstreams_liveness_json, upstreams_to_json};
 use axum::body::Body;
 use axum::extract::{Query, State};
 use axum::http::{Response, StatusCode};
@@ -15,6 +16,7 @@ use prometheus::{gather, Encoder, TextEncoder};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::net::SocketAddr;
+use std::sync::Arc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use tokio::net::TcpListener;
 use tower_http::services::ServeDir;
@@ -36,16 +38,19 @@ struct AppState {
     master_key: String,
     config_sender: Sender<Configuration>,
     config_api_enabled: bool,
+    current_upstreams: Arc<UpstreamsDashMap>,
+    full_upstreams: Arc<UpstreamsDashMap>,
 }
 
 #[allow(unused_mut)]
-pub async fn run_server(config: &APIUpstreamProvider, mut to_return: Sender<Configuration>) {
+pub async fn run_server(config: &APIUpstreamProvider, mut to_return: Sender<Configuration>, upstreams_curr: Arc<UpstreamsDashMap>, upstreams_full: Arc<UpstreamsDashMap>) {
     let app_state = AppState {
         master_key: config.masterkey.clone(),
         config_sender: to_return.clone(),
         config_api_enabled: config.config_api_enabled.clone(),
+        current_upstreams: upstreams_curr,
+        full_upstreams: upstreams_full,
     };
-
     let app = Router::new()
         // .route("/{*wildcard}", get(senderror))
         // .route("/{*wildcard}", post(senderror))
@@ -56,6 +61,7 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: Sender<Conf
         .route("/jwt", post(jwt_gen))
         .route("/conf", post(conf))
         .route("/metrics", get(metrics))
+        .route("/status", get(status))
         .with_state(app_state);
 
     if let Some(value) = &config.tls_address {
@@ -82,27 +88,41 @@ pub async fn run_server(config: &APIUpstreamProvider, mut to_return: Sender<Conf
     axum::serve(listener, app).await.unwrap();
 }
 
-async fn conf(State(mut st): State<AppState>, Query(params): Query<HashMap<String, String>>, content: String) -> impl IntoResponse {
+async fn conf(State(st): State<AppState>, Query(params): Query<HashMap<String, String>>, content: String) -> impl IntoResponse {
     if !st.config_api_enabled {
-        return Response::builder()
-            .status(StatusCode::FORBIDDEN)
-            .body(Body::from("Config remote API is disabled !\n"))
-            .unwrap();
+        return Response::builder().status(StatusCode::FORBIDDEN).body(Body::from("Config API is disabled !\n")).unwrap();
     }
-
     if let Some(s) = params.get("key") {
         if s.to_owned() == st.master_key {
-            if let Some(serverlist) = crate::utils::parceyaml::load_configuration(content.as_str(), "content").await {
-                st.config_sender.send(serverlist).await.unwrap();
-                return Response::builder().status(StatusCode::OK).body(Body::from("Config, conf file, updated !\n")).unwrap();
-            } else {
-                return Response::builder().status(StatusCode::BAD_GATEWAY).body(Body::from("Failed to parse config!\n")).unwrap();
-            };
+            let strcontent = content.as_str();
+            let parsed = serde_yaml::from_str::<Config>(strcontent);
+            match parsed {
+                Ok(_) => {
+                    if let Some(s) = params.get("key") {
+                        if s.to_owned() == st.master_key {
+                            let _ = tokio::spawn(async move { apply_config(content.as_str(), st).await });
+                            return Response::builder().status(StatusCode::OK).body(Body::from("Accepted! Applying in background\n")).unwrap();
+                        }
+                    }
+                    return Response::builder().status(StatusCode::FORBIDDEN).body(Body::from("Access Denied !\n")).unwrap();
+                }
+                Err(err) => {
+                    error!("Failed to parse upstreams file: {}", err);
+                    return Response::builder().status(StatusCode::BAD_GATEWAY).body(Body::from(format!("Failed: {}\n", err))).unwrap();
+                }
+            }
         }
     }
     Response::builder().status(StatusCode::FORBIDDEN).body(Body::from("Access Denied !\n")).unwrap()
 }
 
+async fn apply_config(content: &str, mut st: AppState) {
+    let sl = crate::utils::parceyaml::load_configuration(content, "content").await;
+    if let Some(serverlist) = sl.0 {
+        let _ = st.config_sender.send(serverlist).await;
+    }
+}
+
 async fn jwt_gen(State(state): State<AppState>, Json(payload): Json<InputKey>) -> (StatusCode, Json<OutToken>) {
     if payload.master_key == state.master_key {
         let now = SystemTime::now() + Duration::from_secs(payload.valid * 60);
@@ -132,7 +152,6 @@ async fn jwt_gen(State(state): State<AppState>, Json(payload): Json<InputKey>) -
 async fn metrics() -> impl IntoResponse {
     let metric_families = gather();
     let encoder = TextEncoder::new();
-
     let mut buffer = Vec::new();
     if let Err(e) = encoder.encode(&metric_families, &mut buffer) {
         // encoding error fallback
@@ -141,7 +160,6 @@ async fn metrics() -> impl IntoResponse {
             .body(Body::from(format!("Failed to encode metrics: {}", e)))
             .unwrap();
     }
-
     Response::builder()
         .status(StatusCode::OK)
         .header("Content-Type", encoder.format_type())
@@ -149,7 +167,35 @@ async fn metrics() -> impl IntoResponse {
         .unwrap()
 }
 
-// #[allow(dead_code)]
-// async fn senderror() -> impl IntoResponse {
-//     Response::builder().status(StatusCode::BAD_GATEWAY).body(Body::from("No live upstream found!\n")).unwrap()
-// }
+async fn status(State(st): State<AppState>, Query(params): Query<HashMap<String, String>>) -> impl IntoResponse {
+    if let Some(_) = params.get("live") {
+        let r = upstreams_liveness_json(&st.full_upstreams, &st.current_upstreams);
+        return Response::builder()
+            .status(StatusCode::OK)
+            .header("Content-Type", "application/json")
+            .body(Body::from(format!("{}", r)))
+            .unwrap();
+    }
+    if let Some(_) = params.get("all") {
+        let resp = upstreams_to_json(&st.current_upstreams);
+        match resp {
+            Ok(j) => {
+                return Response::builder()
+                    .status(StatusCode::OK)
+                    .header("Content-Type", "application/json")
+                    .body(Body::from(j))
+                    .unwrap()
+            }
+            Err(e) => {
+                return Response::builder()
+                    .status(StatusCode::INTERNAL_SERVER_ERROR)
+                    .body(Body::from(format!("Failed to get status: {}", e)))
+                    .unwrap();
+            }
+        }
+    }
+    Response::builder()
+        .status(StatusCode::INTERNAL_SERVER_ERROR)
+        .body(Body::from(format!("Parameter mismatch")))
+        .unwrap()
+}