Performance improvement. String removal from hot paths.

added new metric aralez_requests_by_upstream
updates on API server https://sadoyan.github.io/aralez-docs/assets/api/
2026-04-30 23:08:40 +08:00 · 2026-01-27 16:19:51 +01:00 · 2026-01-25 18:08:15 +01:00 · 2026-01-22 16:50:51 +01:00 · 2026-01-21 20:01:16 +01:00 · 2026-01-20 19:16:27 +01:00
22 changed files with 1385 additions and 773 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/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"] }
+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"
--- a/README.md
+++ b/README.md
@@ -4,8 +4,12 @@

 # Aralez (Արալեզ),

-### **Reverse proxy and service mesh built on top of Cloudflare's Pingora**
+### **Reverse proxy built on top of Cloudflare's Pingora**

+Aralez is a high-performance Rust reverse proxy with zero-configuration automatic protocol handling, TLS, and upstream management,
+featuring Consul and Kubernetes integration for dynamic pod discovery and health-checked routing, acting as a lightweight ingress-style proxy.
+
+---
 What Aralez means ?
 **Aralez = Արալեզ** <ins>.Named after the legendary Armenian guardian spirit, winged dog-like creature, that descend upon fallen heroes to lick their wounds and resurrect them.</ins>.

@@ -187,7 +191,10 @@ provider: "file"
 sticky_sessions: false
 to_https: false
 rate_limit: 10
-headers:
+server_headers:
+  - "X-Forwarded-Proto:https"
+  - "X-Forwarded-Port:443"
+client_headers:
  - "Access-Control-Allow-Origin:*"
  - "Access-Control-Allow-Methods:POST, GET, OPTIONS"
  - "Access-Control-Max-Age:86400"
@@ -199,7 +206,10 @@ myhost.mydomain.com:
    "/":
      rate_limit: 20
      to_https: false
-      headers:
+      server_headers:
+        - "X-Something-Else:Foobar"
+        - "X-Another-Header:Hohohohoho"
+      client_headers:
        - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
        - "X-Proxy-From:Hopaaaaaaaaaaaar"
      servers:
@@ -207,7 +217,7 @@ myhost.mydomain.com:
        - "127.0.0.2:8000"
    "/foo":
      to_https: true
-      headers:
+      client_headers:
        - "X-Another-Header:Hohohohoho"
      servers:
        - "127.0.0.4:8443"
@@ -222,6 +232,8 @@ myhost.mydomain.com:

 - Sticky sessions are disabled globally. This setting applies to all upstreams. If enabled all requests will be 301 redirected to HTTPS.
 - HTTP to HTTPS redirect disabled globally, but can be overridden by `to_https` setting per upstream.
+- All upstreams will receive custom headers : `X-Forwarded-Proto:https` and `X-Forwarded-Port:443`
+- Additionally, myhost.mydomain.com with path `/` will receive custom headers : `X-Another-Header:Hohohohoho` and `X-Something-Else:Foobar`
 - Requests to each hosted domains will be limited to 10 requests per second per virtualhost.
    - Requests limits are calculated per requester ip plus requested virtualhost.
    - If the requester exceeds the limit it will receive `429 Too Many Requests` error.
@@ -340,20 +352,33 @@ curl  -u username:password -H 'Host: myip.mydomain.com' http://127.0.0.1:6193/
 - Sticky session support.
 - HTTP2 ready.

-📊 Why Choose Aralez? – Feature Comparison
+### 🧩 Summary Table: Feature Comparison

-| Feature                    | **Aralez**                                                           | **Nginx**                | **HAProxy**             | **Traefik**     |
-|----------------------------|----------------------------------------------------------------------|--------------------------|-------------------------|-----------------|
-| **Hot Reload**             | ✅ Yes (live, API/file)                                               | ⚠️ Reloads config        | ⚠️ Reloads config       | ✅ Yes (dynamic) |
-| **JWT Auth**               | ✅ Built-in                                                           | ❌ External scripts       | ❌ External Lua or agent | ⚠️ With plugins |
-| **WebSocket Support**      | ✅ Automatic                                                          | ⚠️ Manual config         | ✅ Yes                   | ✅ Yes           |
-| **gRPC Support**           | ✅ Automatic (no config)                                              | ⚠️ Manual + HTTP/2 + TLS | ⚠️ Complex setup        | ✅ Native        |
-| **TLS Termination**        | ✅ Built-in (OpenSSL)                                                 | ✅ Yes                    | ✅ Yes                   | ✅ Yes           |
-| **TLS Upstream Detection** | ✅ Automatic                                                          | ❌                        | ❌                       | ❌               |
-| **HTTP/2 Support**         | ✅ Automatic                                                          | ⚠️ Requires extra config | ⚠️ Requires build flags | ✅ Native        |
-| **Sticky Sessions**        | ✅ Cookie-based                                                       | ⚠️ In plus version only  | ✅                       | ✅               |
-| **Prometheus Metrics**     | ✅ [Built in](https://github.com/sadoyan/aralez/blob/main/METRICS.md) | ⚠️ With Lua or exporter  | ⚠️ With external script | ✅ Native        |
-| **Built With**             | 🦀 Rust                                                              | C                        | C                       | Go              |
+| Feature / Proxy                  |    **Aralez**     |          **Nginx**          |    **HAProxy**    |           **Traefik**            |    **Caddy**    |    **Envoy**    |
+|----------------------------------|:-----------------:|:---------------------------:|:-----------------:|:--------------------------------:|:---------------:|:---------------:|
+| **Hot Reload (Zero Downtime)**   |  ✅ **Automatic**  | ⚙️ Manual (graceful reload) |     ⚙️ Manual     |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Auto Cert Reload (from disk)** |  ✅ **Automatic**  |            ❌ No             |       ❌ No        | ✅ Automatic (Let's Encrypt only) |   ✅ Automatic   |    ⚙️ Manual    |
+| **Auth: Basic / API Key / JWT**  |  ✅ **Built-in**   |        ⚙️ Basic only        |   ⚙️ Basic only   |          ✅ Config-based          | ✅ Config-based  | ✅ Config-based  |
+| **TLS / HTTP2 Termination**      |  ✅ **Automatic**  |      ⚙️ Manual config       | ⚙️ Manual config  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Built-in A+ TLS Grades**       |  ✅ **Automatic**  |      ⚙️ Manual tuning       |     ⚙️ Manual     |            ⚙️ Manual             |   ✅ Automatic   |    ⚙️ Manual    |
+| **gRPC Proxy**                   | ✅ **Zero-Config** |       ⚙️ Manual setup       |     ⚙️ Manual     |         ⚙️ Needs config          | ⚙️ Needs config | ⚙️ Needs config |
+| **SSL Proxy**                    | ✅ **Zero-Config** |          ⚙️ Manual          |     ⚙️ Manual     |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **HTTP/2 Proxy**                 | ✅ **Zero-Config** |      ⚙️ Manual enable       | ⚙️ Manual enable  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **WebSocket Proxy**              | ✅ **Zero-Config** |      ⚙️ Manual upgrade      | ⚙️ Manual upgrade |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Sticky Sessions**              |  ✅ **Built-in**   |       ⚙️ Config-based       |  ⚙️ Config-based  |           ✅ Automatic            |   ⚙️ Limited    | ✅ Config-based  |
+| **Prometheus Metrics**           |  ✅ **Built-in**   |    ⚙️ External exporter     |    ✅ Built-in     |            ✅ Built-in            |   ✅ Built-in    |   ✅ Built-in    |
+| **Consul Integration**           |     ✅ **Yes**     |            ❌ No             |  ⚙️ Via DNS only  |              ✅ Yes               |      ❌ No       |      ✅ Yes      |
+| **Kubernetes Integration**       |     ✅ **Yes**     |   ⚙️ Needs ingress setup    |    ⚙️ External    |              ✅ Yes               |   ⚙️ Limited    |      ✅ Yes      |
+| **Request Limiter**              |     ✅ **Yes**     |       ✅ Config-based        |  ✅ Config-based   |          ✅ Config-based          | ✅ Config-based  | ✅ Config-based  |
+| **Serve Static Files**           |     ✅ **Yes**     |            ✅ Yes            |     ⚙️ Basic      |           ✅ Automatic            |   ✅ Automatic   |      ❌ No       |
+| **Upstream Health Checks**       |  ✅ **Automatic**  |      ⚙️ Manual config       | ⚙️ Manual config  |           ✅ Automatic            |   ✅ Automatic   |   ✅ Automatic   |
+| **Built With**                   |    🦀 **Rust**    |              C              |         C         |                Go                |       Go        |       C++       |
+
+---
+
+✅ **Automatic / Zero-Config** – Works immediately, no setup required  
+⚙️ **Manual / Config-based** – Requires explicit configuration or modules  
+❌ **No** – Not supported

 ## 💡 Simple benchmark by [Oha](https://github.com/hatoo/oha)

--- a/etc/upstreams.yaml
+++ b/etc/upstreams.yaml
@@ -3,11 +3,13 @@ provider: "file" # "file" "consul" "kubernetes"
 sticky_sessions: false
 to_https: false
 rate_limit: 100
-headers:
+server_headers:
+  - "X-Forwarded-Proto:https"
+  - "X-Forwarded-Port:443"
+client_headers:
  - "Access-Control-Allow-Origin:*"
  - "Access-Control-Allow-Methods:POST, GET, OPTIONS"
  - "Access-Control-Max-Age:86400"
-  - "Strict-Transport-Security:max-age=31536000; includeSubDomains; preload"
 #authorization:
 #  type: "jwt"
 #  creds: "910517d9-f9a1-48de-8826-dbadacbd84af-cb6f830e-ab16-47ec-9d8f-0090de732774"
@@ -21,38 +23,38 @@ consul:
    - "http://192.168.1.200:8500"
    - "http://192.168.1.201:8500"
  services: # hostname: The hostname to access the proxy server, upstream : The real service name in Consul database.
-    - hostname: "vt-webapi-service"
-      upstream: "vt-webapi-service-health"
+    - hostname: "webapi-service"
+      upstream: "webapi-service-health"
      path: "/one"
-      headers:
+      client_headers:
        - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
        - "X-Proxy-From:Aralez"
      rate_limit: 1
      to_https: false
-    - hostname: "vt-webapi-service"
-      upstream: "vt-webapi-service-health"
+    - hostname: "webapi-service"
+      upstream: "webapi-service-health"
      path: "/"
  token: "8e2db809-845b-45e1-8b47-2c8356a09da0-a4370955-18c2-4d6e-a8f8-ffcc0b47be81" # Consul server access token, If Consul auth is enabled
 kubernetes:
  servers:
    - "192.168.1.55:443" #For testing only, overrides with KUBERNETES_SERVICE_HOST : KUBERNETES_SERVICE_PORT_HTTPS env variables.
  services:
-    - hostname: "vt-webapi-service"
+    - hostname: "webapi-service"
      path: "/"
-      upstream: "vt-webapi-service"
-    - hostname: "vt-webapi-service"
+      upstream: "webapi-service"
+    - hostname: "webapi-service"
      upstream: "vt-console-service"
      path: "/one"
-      headers:
+      client_headers:
        - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
        - "X-Proxy-From:Aralez"
      rate_limit: 100
      to_https: false
-    - hostname: "vt-webapi-service"
+    - hostname: "webapi-service"
      upstream: "vt-rambulik-service"
      path: "/two"
-    - hostname: "vt-websocket-service"
-      upstream: "vt-websocket-service"
+    - hostname: "websocket-service"
+      upstream: "websocket-service"
      path: "/"
  tokenpath: "/path/to/kubetoken.txt" #If not set, will default to /var/run/secrets/kubernetes.io/serviceaccount/token
 upstreams:
@@ -61,7 +63,7 @@ upstreams:
      "/":
        rate_limit: 200
        to_https: false
-        headers:
+        client_headers:
          - "X-Proxy-From:Aralez"
        servers:
          - "127.0.0.1:8000"
@@ -71,7 +73,10 @@ upstreams:
          - "127.0.0.5:8000"
      "/ping":
        to_https: false
-        headers:
+        server_headers:
+          - "X-Forwarded-Proto:https"
+          - "X-Forwarded-Port:443"
+        client_headers:
          - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
          - "X-Proxy-From:Aralez"
        servers:
@@ -84,7 +89,7 @@ upstreams:
    paths:
      "/":
        to_https: false
-        headers:
+        client_headers:
          - "X-Some-Thing:Yaaaaaaaaaaaaaaa"
        servers:
          - "192.168.1.1:8000"
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,11 +1,10 @@
 pub mod auth;
-pub mod consul;
 pub mod discovery;
 pub mod dnsclient;
 mod filewatch;
 pub mod healthcheck;
+pub mod httpclient;
 pub mod jwt;
-pub mod kuber;
 pub mod kuberconsul;
 pub mod metrics;
 pub mod parceyaml;
@@ -13,3 +12,4 @@ pub mod state;
 pub mod structs;
 pub mod tls;
 pub mod tools;
+// pub mod watchksecret;
--- a/src/utils/auth.rs
+++ b/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 {
@@ -40,16 +41,6 @@ impl AuthValidator for JwtAuth<'_> {
        if let Some(tok) = get_query_param(session, "araleztoken") {
            return check_jwt(tok.as_str(), jwtsecret);
        }
-
-        // if let Some(header) = session.get_header("authorization") {
-        //     let h = header.to_str().ok().unwrap().split(" ").collect::<Vec<_>>();
-        //     match h.len() {
-        //         n => {
-        //             return check_jwt(h[n - 1], jwtsecret);
-        //         }
-        //     }
-        // }
-
        if let Some(auth_header) = session.get_header("authorization") {
            if let Ok(header_str) = auth_header.to_str() {
                if let Some((scheme, token)) = header_str.split_once(' ') {
@@ -66,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)
        }
        _ => {
--- a/src/utils/consul.rs
+++ b/src/utils/consul.rs
@@ -1,119 +0,0 @@
-use crate::utils::kuberconsul::{list_to_upstreams, match_path};
-use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
-use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
-use dashmap::DashMap;
-use futures::channel::mpsc::Sender;
-use futures::SinkExt;
-use pingora::prelude::sleep;
-use rand::Rng;
-use reqwest::header::{HeaderMap, HeaderValue};
-use reqwest::Client;
-use serde::Deserialize;
-use std::collections::HashMap;
-use std::env;
-use std::sync::atomic::AtomicUsize;
-use std::sync::Arc;
-use std::time::Duration;
-
-#[derive(Debug, Deserialize)]
-struct Service {
-    #[serde(rename = "ServiceTaggedAddresses")]
-    tagged_addresses: HashMap<String, TaggedAddress>,
-}
-
-#[derive(Debug, Deserialize)]
-struct TaggedAddress {
-    #[serde(rename = "Address")]
-    address: String,
-    #[serde(rename = "Port")]
-    port: u16,
-}
-
-pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
-    let prev_upstreams = UpstreamsDashMap::new();
-    loop {
-        if let Some(consul) = config.consul.clone() {
-            let servers = consul.servers.unwrap_or(vec![format!(
-                "{}:{}",
-                env::var("CONSUL_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
-                env::var("CONSUL_SERVICE_PORT").unwrap_or("0".to_string())
-            )]);
-            let end = servers.len() - 1;
-            let upstreams = UpstreamsDashMap::new();
-            let mut num = 0;
-            if end > 0 {
-                num = rand::rng().random_range(0..end);
-            }
-            let consul_data = servers.get(num).unwrap().to_string();
-            let ss = consul_data + "/v1/catalog/service/";
-            if let Some(ref svc) = consul.services {
-                for i in svc {
-                    let header_list = DashMap::new();
-                    let mut hl = Vec::new();
-                    build_headers(&i.headers, config.as_ref(), &mut hl);
-                    if hl.len() > 0 {
-                        header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
-                        config.headers.insert(i.hostname.clone(), header_list);
-                    }
-                    let pref: String = ss.clone() + &i.upstream;
-                    let list = get_by_http(pref, consul.token.clone(), &i).await;
-                    list_to_upstreams(list, &upstreams, &i);
-                }
-            }
-            if !compare_dashmaps(&upstreams, &prev_upstreams) {
-                let mut tosend: Configuration = Configuration {
-                    upstreams: Default::default(),
-                    headers: Default::default(),
-                    consul: None,
-                    kubernetes: None,
-                    typecfg: "".to_string(),
-                    extraparams: config.extraparams.clone(),
-                };
-
-                clone_dashmap_into(&upstreams, &prev_upstreams);
-                clone_dashmap_into(&upstreams, &tosend.upstreams);
-                tosend.headers = config.headers.clone();
-                tosend.extraparams.authentication = config.extraparams.authentication.clone();
-                tosend.typecfg = config.typecfg.clone();
-                tosend.consul = config.consul.clone();
-                print_upstreams(&tosend.upstreams);
-                toreturn.send(tosend).await.unwrap();
-            }
-        }
-        sleep(Duration::from_secs(5)).await;
-    }
-}
-
-async fn get_by_http(url: String, token: Option<String>, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<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 {
-        headers.insert("X-Consul-Token", HeaderValue::from_str(&token).unwrap());
-    }
-    let to = Duration::from_secs(1);
-    let resp = client.get(url).timeout(to).send().await.ok()?;
-    if !resp.status().is_success() {
-        eprintln!("Consul API returned status: {}", resp.status());
-        return None;
-    }
-    let mut inner_vec = Vec::new();
-    let upstreams: DashMap<String, (Vec<InnerMap>, AtomicUsize)> = DashMap::new();
-    let endpoints: Vec<Service> = 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 to_add = InnerMap {
-            address: addr,
-            port: prt,
-            is_ssl: false,
-            is_http2: false,
-            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)
-}
--- a/src/utils/discovery.rs
+++ b/src/utils/discovery.rs
@@ -1,6 +1,6 @@
 use crate::utils::filewatch;
-use crate::utils::structs::Configuration;
-use crate::utils::{consul, kuber};
+use crate::utils::kuberconsul::{ConsulDiscovery, KubernetesDiscovery, ServiceDiscovery};
+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>) {
@@ -51,13 +53,13 @@ impl Discovery for FromFileProvider {
 #[async_trait]
 impl Discovery for ConsulProvider {
    async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(consul::start(tx.clone(), self.config.clone()));
+        tokio::spawn(ConsulDiscovery.fetch_upstreams(self.config.clone(), tx));
    }
 }

 #[async_trait]
 impl Discovery for KubernetesProvider {
    async fn start(&self, tx: Sender<Configuration>) {
-        tokio::spawn(kuber::start(tx.clone(), self.config.clone()));
+        tokio::spawn(KubernetesDiscovery.fetch_upstreams(self.config.clone(), tx));
    }
 }
--- a/src/utils/filewatch.rs
+++ b/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();
--- a/src/utils/healthcheck.rs
+++ b/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();
@@ -46,7 +53,7 @@ async fn build_upstreams(fullist: &UpstreamsDashMap, method: &str, client: &Clie
            let mut innervec = Vec::new();

            for (_, upstream) in path_entry.value().0.iter().enumerate() {
-                let tls = detect_tls(upstream.address.as_str(), &upstream.port, &client).await;
+                let tls = detect_tls(&upstream.address.to_string(), &upstream.port, &client).await;
                let is_h2 = matches!(tls.1, Some(Version::HTTP_2));

                let link = if tls.0 {
@@ -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)));
        }
--- a/src/utils/httpclient.rs
+++ b/src/utils/httpclient.rs
@@ -0,0 +1,80 @@
+use crate::utils::kuberconsul::{match_path, ConsulService, KubeEndpoints};
+use crate::utils::structs::{InnerMap, ServiceMapping};
+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<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 {
+        headers.insert("X-Consul-Token", HeaderValue::from_str(&token).unwrap());
+    }
+    let to = Duration::from_secs(1);
+    let resp = client.get(url).timeout(to).send().await.ok()?;
+    if !resp.status().is_success() {
+        eprintln!("Consul API returned status: {}", resp.status());
+        return None;
+    }
+    let mut inner_vec = Vec::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 = Arc::from(InnerMap {
+            address: addr,
+            port: prt,
+            is_ssl: false,
+            is_http2: false,
+            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<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()?;
+    if !resp.status().is_success() {
+        eprintln!("Kubernetes API returned status: {}", resp.status());
+        return None;
+    }
+    let endpoints: KubeEndpoints = resp.json().await.ok()?;
+
+    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 = Arc::from(InnerMap {
+                            address: addr.ip.parse().unwrap(),
+                            port: port.port.clone(),
+                            is_ssl: false,
+                            is_http2: false,
+                            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)
+}
--- a/src/utils/kuber.rs
+++ b/src/utils/kuber.rs
@@ -1,133 +0,0 @@
-use crate::utils::kuberconsul::{list_to_upstreams, match_path};
-use crate::utils::parceyaml::build_headers;
-use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
-use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
-use dashmap::DashMap;
-use futures::channel::mpsc::Sender;
-use futures::SinkExt;
-use pingora::prelude::sleep;
-use rand::Rng;
-use reqwest::Client;
-use std::env;
-use std::sync::atomic::AtomicUsize;
-use std::sync::Arc;
-use std::time::Duration;
-use tokio::fs::File;
-use tokio::io::AsyncReadExt;
-
-#[derive(Debug, serde::Deserialize)]
-struct Endpoints {
-    subsets: Option<Vec<Subset>>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Subset {
-    addresses: Option<Vec<Address>>,
-    ports: Option<Vec<Port>>,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Address {
-    ip: String,
-}
-
-#[derive(Debug, serde::Deserialize)]
-struct Port {
-    port: u16,
-}
-
-pub async fn start(mut toreturn: Sender<Configuration>, config: Arc<Configuration>) {
-    let prev_upstreams = UpstreamsDashMap::new();
-    loop {
-        if let Some(kuber) = config.kubernetes.clone() {
-            let upstreams = UpstreamsDashMap::new();
-            let path = kuber.tokenpath.unwrap_or("/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
-            let token = read_token(path.as_str()).await;
-            let servers = kuber.servers.unwrap_or(vec![format!(
-                "{}:{}",
-                env::var("KUBERNETES_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
-                env::var("KUBERNETES_SERVICE_PORT_HTTPS").unwrap_or("0".to_string())
-            )]);
-            let end = servers.len() - 1;
-            let mut num = 0;
-            if end > 0 {
-                num = rand::rng().random_range(0..end);
-            }
-
-            let server = servers.get(num).unwrap().to_string();
-            if let Some(svc) = kuber.services {
-                for i in svc {
-                    let header_list = DashMap::new();
-
-                    let mut hl = Vec::new();
-                    build_headers(&i.headers, config.as_ref(), &mut hl);
-                    if hl.len() > 0 {
-                        header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
-                        config.headers.insert(i.hostname.clone(), header_list);
-                    }
-                    let url = format!("https://{}/api/v1/namespaces/staging/endpoints/{}", server, i.hostname);
-                    let list = get_by_http(&*url, &*token, &i).await;
-                    list_to_upstreams(list, &upstreams, &i);
-                }
-            }
-
-            if !compare_dashmaps(&upstreams, &prev_upstreams) {
-                let tosend: Configuration = Configuration {
-                    upstreams: Default::default(),
-                    headers: config.headers.clone(),
-                    consul: config.consul.clone(),
-                    kubernetes: config.kubernetes.clone(),
-                    typecfg: config.typecfg.clone(),
-                    extraparams: config.extraparams.clone(),
-                };
-                clone_dashmap_into(&upstreams, &prev_upstreams);
-                clone_dashmap_into(&upstreams, &tosend.upstreams);
-                print_upstreams(&tosend.upstreams);
-                toreturn.send(tosend).await.unwrap();
-            }
-        }
-        sleep(Duration::from_secs(5)).await;
-    }
-}
-
-pub async fn get_by_http(url: &str, token: &str, conf: &ServiceMapping) -> Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>> {
-    let client = Client::builder().timeout(Duration::from_secs(2)).danger_accept_invalid_certs(true).build().ok()?;
-    let to = Duration::from_secs(1);
-    let resp = client.get(url).timeout(to).bearer_auth(token).send().await.ok()?;
-    if !resp.status().is_success() {
-        eprintln!("Kubernetes API returned status: {}", resp.status());
-        return None;
-    }
-    let endpoints: Endpoints = resp.json().await.ok()?;
-    let upstreams: DashMap<String, (Vec<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 {
-                            address: addr.ip.clone(),
-                            port: port.port.clone(),
-                            is_ssl: false,
-                            is_http2: false,
-                            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)
-}
-
-async fn read_token(path: &str) -> String {
-    let mut file = File::open(path).await.unwrap();
-    let mut contents = String::new();
-    file.read_to_string(&mut contents).await.unwrap();
-    contents.trim().to_string()
-}
--- a/src/utils/kuberconsul.rs
+++ b/src/utils/kuberconsul.rs
@@ -1,29 +1,232 @@
-use crate::utils::structs::{InnerMap, ServiceMapping, UpstreamsDashMap};
+use crate::utils::httpclient;
+use crate::utils::parceyaml::build_headers;
+use crate::utils::structs::{Configuration, InnerMap, ServiceMapping, UpstreamsDashMap};
+use crate::utils::tools::{clone_dashmap_into, compare_dashmaps, print_upstreams};
+use async_trait::async_trait;
 use dashmap::DashMap;
+use futures::channel::mpsc::Sender;
+use futures::SinkExt;
+use pingora::prelude::sleep;
+use rand::Rng;
+use serde::Deserialize;
+use std::collections::HashMap;
+use std::env;
+use std::fs;
+use std::path::Path;
 use std::sync::atomic::AtomicUsize;
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::fs::File;
+use tokio::io::AsyncReadExt;

-pub fn list_to_upstreams(lt: Option<DashMap<String, (Vec<InnerMap>, AtomicUsize)>>, upstreams: &UpstreamsDashMap, i: &ServiceMapping) {
+// #[derive(Debug, Deserialize)]
+// pub struct KubeEndpointsList {
+//     pub items: Vec<KubeEndpoints>,
+// }
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeEndpoints {
+    pub subsets: Option<Vec<KubeSubset>>,
+}
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeSubset {
+    pub addresses: Option<Vec<KubeAddress>>,
+    pub ports: Option<Vec<KubePort>>,
+}
+
+#[derive(Debug, serde::Deserialize)]
+pub struct KubeAddress {
+    pub ip: String,
+}
+
+#[derive(Debug, serde::Deserialize)]
+pub struct KubePort {
+    pub port: u16,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ConsulService {
+    #[serde(rename = "ServiceTaggedAddresses")]
+    pub tagged_addresses: HashMap<String, ConsulTaggedAddress>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ConsulTaggedAddress {
+    #[serde(rename = "Address")]
+    pub address: String,
+    #[serde(rename = "Port")]
+    pub port: u16,
+}
+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)));
        }
    }
 }
+
+async fn read_token(path: &str) -> String {
+    let mut file = File::open(path).await.unwrap();
+    let mut contents = String::new();
+    file.read_to_string(&mut contents).await.unwrap();
+    contents.trim().to_string()
+}
+#[async_trait]
+pub trait ServiceDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, toreturn: Sender<Configuration>);
+}
+
+pub struct KubernetesDiscovery;
+pub struct ConsulDiscovery;
+
+#[async_trait]
+impl ServiceDiscovery for KubernetesDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, mut toreturn: Sender<Configuration>) {
+        let prev_upstreams = UpstreamsDashMap::new();
+
+        if let Some(kuber) = config.kubernetes.clone() {
+            let servers = kuber.servers.unwrap_or(vec![format!(
+                "{}:{}",
+                env::var("KUBERNETES_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
+                env::var("KUBERNETES_SERVICE_PORT_HTTPS").unwrap_or("0".to_string())
+            )]);
+
+            let end = servers.len().saturating_sub(1);
+            let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
+            let server = servers.get(num).unwrap().to_string();
+            let path = kuber.tokenpath.unwrap_or("/var/run/secrets/kubernetes.io/serviceaccount/token".to_string());
+            let namespace = get_current_namespace().unwrap_or_else(|| "default".to_string());
+            let token = read_token(path.as_str()).await;
+            loop {
+                let upstreams = UpstreamsDashMap::new();
+                if let Some(kuber) = config.kubernetes.clone() {
+                    if let Some(svc) = kuber.services {
+                        for service in svc {
+                            let header_list: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
+                            let mut hl = Vec::new();
+                            build_headers(&service.client_headers, config.as_ref(), &mut hl);
+                            if !hl.is_empty() {
+                                match service.path.clone() {
+                                    Some(path) => {
+                                        header_list.insert(Arc::from(path.as_str()), hl);
+                                    }
+                                    None => {
+                                        header_list.insert(Arc::from("/"), hl);
+                                    }
+                                }
+
+                                // 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(Arc::from(service.hostname.clone()), header_list);
+                            }
+                            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 {
+                        toreturn.send(lt).await.unwrap();
+                    }
+                }
+                sleep(Duration::from_secs(5)).await;
+            }
+        }
+    }
+}
+
+fn get_current_namespace() -> Option<String> {
+    let ns_path = "/var/run/secrets/kubernetes.io/serviceaccount/namespace";
+    if Path::new(ns_path).exists() {
+        if let Ok(contents) = fs::read_to_string(ns_path) {
+            return Some(contents.trim().to_string());
+        }
+    }
+    std::env::var("POD_NAMESPACE").ok()
+}
+
+#[async_trait]
+impl ServiceDiscovery for ConsulDiscovery {
+    async fn fetch_upstreams(&self, config: Arc<Configuration>, mut toreturn: Sender<Configuration>) {
+        let prev_upstreams = UpstreamsDashMap::new();
+        loop {
+            let upstreams = UpstreamsDashMap::new();
+
+            if let Some(consul) = config.consul.clone() {
+                let servers = consul.servers.unwrap_or(vec![format!(
+                    "{}:{}",
+                    env::var("CONSUL_SERVICE_HOST").unwrap_or("0.0.0.0".to_string()),
+                    env::var("CONSUL_SERVICE_PORT").unwrap_or("0".to_string())
+                )]);
+                let end = servers.len().saturating_sub(1);
+                let num = if end > 0 { rand::rng().random_range(0..end) } else { 0 };
+                let consul_data = servers.get(num).unwrap().to_string();
+                let ss = consul_data + "/v1/catalog/service/";
+
+                if let Some(svc) = consul.services {
+                    for i in svc {
+                        let header_list = DashMap::new();
+                        let mut hl = Vec::new();
+                        build_headers(&i.client_headers, config.as_ref(), &mut hl);
+                        if !hl.is_empty() {
+                            match i.path.clone() {
+                                Some(path) => {
+                                    header_list.insert(Arc::from(path.as_str()), hl);
+                                }
+                                None => {
+                                    header_list.insert(Arc::from("/"), hl);
+                                }
+                            }
+                            // header_list.insert(i.path.clone().unwrap_or("/".to_string()), hl);
+                            config.client_headers.insert(Arc::from(i.hostname.clone()), header_list);
+                        }
+
+                        let pref = ss.clone() + &i.upstream;
+                        let list = httpclient::for_consul(pref, consul.token.clone(), &i).await;
+                        list_to_upstreams(list, &upstreams, &i);
+                    }
+                }
+            }
+            if let Some(lt) = clone_compare(&upstreams, &prev_upstreams, &config).await {
+                toreturn.send(lt).await.unwrap();
+            }
+            sleep(Duration::from_secs(5)).await;
+        }
+    }
+}
+async fn clone_compare(upstreams: &UpstreamsDashMap, prev_upstreams: &UpstreamsDashMap, config: &Arc<Configuration>) -> Option<Configuration> {
+    if !compare_dashmaps(&upstreams, &prev_upstreams) {
+        let tosend: Configuration = Configuration {
+            upstreams: Default::default(),
+            client_headers: config.client_headers.clone(),
+            server_headers: config.server_headers.clone(),
+            consul: config.consul.clone(),
+            kubernetes: config.kubernetes.clone(),
+            typecfg: config.typecfg.clone(),
+            extraparams: config.extraparams.clone(),
+        };
+        clone_dashmap_into(&upstreams, &prev_upstreams);
+        clone_dashmap_into(&upstreams, &tosend.upstreams);
+        print_upstreams(&tosend.upstreams);
+        return Some(tosend);
+    };
+    None
+}
--- a/src/utils/metrics.rs
+++ b/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());
 }
--- a/src/utils/parceyaml.rs
+++ b/src/utils/parceyaml.rs
@@ -6,11 +6,11 @@ use dashmap::DashMap;
 use log::{error, info, warn};
 use std::collections::HashMap;
 use std::sync::atomic::AtomicUsize;
-// use std::sync::mpsc::{channel, Receiver, Sender};
+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,36 +48,49 @@ 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())
        }
    }
 }

 async fn populate_headers_and_auth(config: &mut Configuration, parsed: &Config) {
-    if let Some(headers) = &parsed.headers {
-        let mut hl = Vec::new();
+    let mut ch: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+    ch.push((Arc::from("Server"), Arc::from("Aralez")));
+    if let Some(headers) = &parsed.client_headers {
        for header in headers {
            if let Some((key, val)) = header.split_once(':') {
-                hl.push((key.trim().to_string(), val.trim().to_string()));
+                ch.push((Arc::from(key), Arc::from(val)));
            }
        }
-
-        let global_headers = DashMap::new();
-        global_headers.insert("/".to_string(), hl);
-        config.headers.insert("GLOBAL_HEADERS".to_string(), global_headers);
    }
+    let global_headers: DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>> = DashMap::new();
+    global_headers.insert(Arc::from("/"), ch);
+    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")));
+    if let Some(headers) = &parsed.server_headers {
+        for header in headers {
+            if let Some((key, val)) = header.split_once(':') {
+                sh.push((Arc::from(key.trim()), Arc::from(val.trim())));
+            }
+        }
+    }
+    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(Arc::from("GLOBAL_SERVER_HEADERS"), server_global_headers);

    config.extraparams.sticky_sessions = parsed.sticky_sessions;
    config.extraparams.to_https = parsed.to_https;
@@ -91,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();
    }
@@ -102,36 +117,41 @@ async fn populate_file_upstreams(config: &mut Configuration, parsed: &Config) {
    if let Some(upstreams) = &parsed.upstreams {
        for (hostname, host_config) in upstreams {
            let path_map = DashMap::new();
-            let header_list = DashMap::new();
+            let client_header_list = DashMap::new();
+            let server_header_list = DashMap::new();
            for (path, path_config) in &host_config.paths {
                if let Some(rate) = &path_config.rate_limit {
                    info!("Applied Rate Limit for {} : {} request per second", hostname, rate);
                }

-                let mut hl: Vec<(String, String)> = Vec::new();
-                build_headers(&path_config.headers, config, &mut hl);
-                header_list.insert(path.clone(), hl);
+                let mut hl: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+                let mut sl: Vec<(Arc<str>, Arc<str>)> = Vec::new();
+                build_headers(&path_config.client_headers, config, &mut hl);
+                build_headers(&path_config.server_headers, config, &mut sl);
+                client_header_list.insert(Arc::from(path.as_str()), hl);
+                server_header_list.insert(Arc::from(path.as_str()), sl);

                let mut server_list = Vec::new();
                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 {
-                                address: ip.trim().to_string(),
+                            server_list.push(Arc::from(InnerMap {
+                                address: ip.trim().parse().unwrap(),
                                port,
                                is_ssl: true,
                                is_http2: false,
                                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.headers.insert(hostname.clone(), 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() {
@@ -218,19 +238,19 @@ fn log_builder(conf: &AppConfig) {
    env_logger::builder().init();
 }

-pub fn build_headers(path_config: &Option<Vec<String>>, config: &Configuration, hl: &mut Vec<(String, String)>) {
+pub fn build_headers(path_config: &Option<Vec<String>>, _config: &Configuration, hl: &mut Vec<(Arc<str>, Arc<str>)>) {
    if let Some(headers) = &path_config {
        for header in headers {
            if let Some((key, val)) = header.split_once(':') {
-                hl.push((key.trim().to_string(), val.trim().to_string()));
-            }
-        }
-        if let Some(push) = config.headers.get("GLOBAL_HEADERS") {
-            for k in push.iter() {
-                for x in k.value() {
-                    hl.push(x.to_owned());
-                }
+                hl.push((Arc::from(key.trim()), Arc::from(val.trim())));
            }
        }
+        // if let Some(push) = config.client_headers.get("GLOBAL_HEADERS") {
+        //     for k in push.iter() {
+        //         for x in k.value() {
+        //             hl.push(x.to_owned());
+        //         }
+        //     }
+        // }
    }
 }
--- a/src/utils/structs.rs
+++ b/src/utils/structs.rs
@@ -1,12 +1,14 @@
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
+use std::net::IpAddr;
 use std::sync::atomic::AtomicUsize;
+use std::sync::Arc;

-pub type UpstreamsDashMap = DashMap<String, DashMap<String, (Vec<InnerMap>, AtomicUsize)>>;
+pub type UpstreamsDashMap = DashMap<Arc<str>, DashMap<Arc<str>, (Vec<Arc<InnerMap>>, AtomicUsize)>>;

-pub type UpstreamsIdMap = DashMap<String, InnerMap>;
-pub type Headers = DashMap<String, DashMap<String, Vec<(String, String)>>>;
+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 {
@@ -15,16 +17,15 @@ pub struct ServiceMapping {
    pub path: Option<String>,
    pub to_https: Option<bool>,
    pub rate_limit: Option<isize>,
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    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)]
@@ -50,7 +51,9 @@ pub struct Config {
    #[serde(default)]
    pub globals: Option<HashMap<String, Vec<String>>>,
    #[serde(default)]
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    #[serde(default)]
+    pub server_headers: Option<Vec<String>>,
    #[serde(default)]
    pub authorization: Option<HashMap<String, String>>,
    #[serde(default)]
@@ -71,14 +74,16 @@ pub struct HostConfig {
 pub struct PathConfig {
    pub servers: Vec<String>,
    pub to_https: Option<bool>,
-    pub headers: Option<Vec<String>>,
+    pub client_headers: Option<Vec<String>>,
+    pub server_headers: Option<Vec<String>>,
    pub rate_limit: Option<isize>,
    pub healthcheck: Option<bool>,
 }
 #[derive(Debug, Default)]
 pub struct Configuration {
    pub upstreams: UpstreamsDashMap,
-    pub headers: Headers,
+    pub client_headers: Headers,
+    pub server_headers: Headers,
    pub consul: Option<Consul>,
    pub kubernetes: Option<Kubernetes>,
    pub typecfg: String,
@@ -109,9 +114,9 @@ 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: String,
+    pub address: IpAddr,
    pub port: u16,
    pub is_ssl: bool,
    pub is_http2: bool,
@@ -124,7 +129,7 @@ pub struct InnerMap {
 impl InnerMap {
    pub fn new() -> Self {
        Self {
-            address: Default::default(),
+            address: "127.0.0.1".parse().unwrap(),
            port: Default::default(),
            is_ssl: Default::default(),
            is_http2: Default::default(),
@@ -134,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>>;
--- a/src/utils/tools.rs
+++ b/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,8 +14,9 @@ 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};
 use std::{fs, process, thread, time};

@@ -132,7 +134,7 @@ pub fn compare_dashmaps(map1: &UpstreamsDashMap, map2: &UpstreamsDashMap) -> boo
    true
 }

-pub fn merge_headers(target: &DashMap<String, Vec<(String, String)>>, source: &DashMap<String, Vec<(String, String)>>) {
+pub fn merge_headers(target: &DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>, source: &DashMap<Arc<str>, Vec<(Arc<str>, Arc<str>)>>) {
    for entry in source.iter() {
        let global_key = entry.key().clone();
        let global_values = entry.value().clone();
@@ -159,7 +161,7 @@ pub fn clone_idmap_into(original: &UpstreamsDashMap, cloned: &UpstreamsIdMap) {
                let hex_hash = base16ct::lower::encode_string(&hash);
                let hh = hex_hash[0..50].to_string();
                let to_add = InnerMap {
-                    address: hh.clone(),
+                    address: "127.0.0.1".parse().unwrap(),
                    port: 0,
                    is_ssl: false,
                    is_http2: false,
@@ -167,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);
        }
@@ -268,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)
+}
--- a/src/web/bgservice.rs
+++ b/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 });
@@ -85,22 +88,38 @@ impl BackgroundService for LB {
                            new.authentication = ss.extraparams.authentication.clone();
                            new.rate_limit = ss.extraparams.rate_limit;
                            self.extraparams.store(Arc::new(new));
-                            self.headers.clear();
+                            self.client_headers.clear();
+                            self.server_headers.clear();

                            for entry in ss.upstreams.iter() {
                                let global_key = entry.key().clone();
-                                let global_values = DashMap::new();
-                                let mut target_entry = ss.headers.entry(global_key).or_insert_with(DashMap::new);
-                                target_entry.extend(global_values);
-                                self.headers.insert(target_entry.key().to_owned(), target_entry.value().to_owned());
+                                let client_global_values = DashMap::new();
+                                let server_global_values = DashMap::new();
+
+                                let mut client_target_entry = ss.client_headers.entry(global_key.clone()).or_insert_with(DashMap::new);
+                                client_target_entry.extend(client_global_values);
+                                let mut server_target_entry = ss.server_headers.entry(global_key).or_insert_with(DashMap::new);
+                                server_target_entry.extend(server_global_values);
+                                self.server_headers.insert(server_target_entry.key().to_owned(), server_target_entry.value().to_owned());
                            }

-                            for path in ss.headers.iter() {
+                            for path in ss.client_headers.iter() {
                                let path_key = path.key().clone();
                                let path_headers = path.value().clone();
-                                self.headers.insert(path_key.clone(), path_headers);
-                                if let Some(global_headers) = ss.headers.get("GLOBAL_HEADERS") {
-                                    if let Some(existing_headers) = self.headers.get_mut(&path_key) {
+                                self.client_headers.insert(path_key.clone(), path_headers);
+                                if let Some(global_headers) = ss.client_headers.get("GLOBAL_CLIENT_HEADERS") {
+                                    if let Some(existing_headers) = self.client_headers.get_mut(&path_key) {
+                                        merge_headers(&existing_headers, &global_headers);
+                                    }
+                                }
+                            }
+
+                            for path in ss.server_headers.iter() {
+                                let path_key = path.key().clone();
+                                let path_headers = path.value().clone();
+                                self.server_headers.insert(path_key.clone(), path_headers);
+                                if let Some(global_headers) = ss.server_headers.get("GLOBAL_SERVER_HEADERS") {
+                                    if let Some(existing_headers) = self.server_headers.get_mut(&path_key) {
                                        merge_headers(&existing_headers, &global_headers);
                                    }
                                }
--- a/src/web/gethosts.rs
+++ b/src/web/gethosts.rs
@@ -2,76 +2,103 @@ use crate::utils::structs::InnerMap;
 use crate::web::proxyhttp::LB;
 use async_trait::async_trait;
 use std::sync::atomic::Ordering;
+use std::sync::Arc;
+
+#[derive(Debug, Clone)]
+pub struct GetHostsReturHeaders {
+    pub client_headers: Option<Vec<(Arc<str>, Arc<str>)>>,
+    pub server_headers: Option<Vec<(Arc<str>, Arc<str>)>>,
+}

 #[async_trait]
 pub trait GetHost {
-    fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<InnerMap>;
-    fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>>;
+    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) {
-                // println!("BIB :===> {:?}", Some(bb.value()));
                return Some(bb.value().clone());
            }
        }
-
        let host_entry = self.ump_upst.get(peer)?;
-        let mut current_path = path.to_string();
-        let mut best_match: Option<InnerMap> = None;
+        let mut end = path.len();
        loop {
-            if let Some(entry) = host_entry.get(&current_path) {
+            let slice = &path[..end];
+            if let Some(entry) = host_entry.get(slice) {
                let (servers, index) = entry.value();
                if !servers.is_empty() {
                    let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
-                    best_match = Some(servers[idx].clone());
-                    break;
+                    return Some(servers[idx].clone());
                }
            }
-            if let Some(pos) = current_path.rfind('/') {
-                current_path.truncate(pos);
+            if let Some(pos) = slice.rfind('/') {
+                end = pos;
            } else {
                break;
            }
        }
-        if best_match.is_none() {
-            if let Some(entry) = host_entry.get("/") {
-                let (servers, index) = entry.value();
-                if !servers.is_empty() {
-                    let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
-                    best_match = Some(servers[idx].clone());
-                }
+        if let Some(entry) = host_entry.get("/") {
+            let (servers, index) = entry.value();
+            if !servers.is_empty() {
+                let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
+                return Some(servers[idx].clone());
            }
        }
-        // println!("Best Match :===> {:?}", best_match);
-        best_match
+        None
    }
-    fn get_header(&self, peer: &str, path: &str) -> Option<Vec<(String, String)>> {
-        let host_entry = self.headers.get(peer)?;
-        let mut current_path = path.to_string();
-        let mut best_match: Option<Vec<(String, String)>> = None;
+
+    fn get_header(&self, peer: &str, path: &str) -> Option<GetHostsReturHeaders> {
+        let client_entry = self.client_headers.get(peer)?;
+        let server_entry = self.server_headers.get(peer)?;
+        let mut current_path = path;
+        let mut clnt_match = None;
        loop {
-            if let Some(entry) = host_entry.get(&current_path) {
+            if let Some(entry) = client_entry.get(current_path) {
                if !entry.value().is_empty() {
-                    best_match = Some(entry.value().clone());
+                    clnt_match = Some(entry.value().clone());
                    break;
                }
            }
            if let Some(pos) = current_path.rfind('/') {
-                current_path.truncate(pos);
+                current_path = if pos == 0 { "/" } else { &current_path[..pos] };
            } else {
                break;
            }
        }
-        if best_match.is_none() {
-            if let Some(entry) = host_entry.get("/") {
+        current_path = path;
+        let mut serv_match = None;
+        loop {
+            if let Some(entry) = server_entry.get(current_path) {
                if !entry.value().is_empty() {
-                    best_match = Some(entry.value().clone());
+                    serv_match = Some(entry.value().clone());
+                    break;
+                }
+            }
+            if let Some(pos) = current_path.rfind('/') {
+                current_path = if pos == 0 { "/" } else { &current_path[..pos] };
+            } else {
+                break;
+            }
+            if serv_match.is_none() {
+                if let Some(entry) = server_entry.get("/") {
+                    if !entry.value().is_empty() {
+                        serv_match = Some(entry.value().clone());
+                        break;
+                    }
                }
            }
        }
-        best_match
+        Some(GetHostsReturHeaders {
+            client_headers: clnt_match,
+            server_headers: serv_match,
+        })
    }
 }
--- a/src/web/proxyhttp.rs
+++ b/src/web/proxyhttp.rs
@@ -14,6 +14,7 @@ use pingora_core::listeners::ALPN;
 use pingora_core::prelude::HttpPeer;
 use pingora_limits::rate::Rate;
 use pingora_proxy::{ProxyHttp, Session};
+// use std::net::{IpAddr, Ipv4Addr};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::Instant;
@@ -25,19 +26,22 @@ pub struct LB {
    pub ump_upst: Arc<UpstreamsDashMap>,
    pub ump_full: Arc<UpstreamsDashMap>,
    pub ump_byid: Arc<UpstreamsIdMap>,
-    pub headers: Arc<Headers>,
+    pub client_headers: Arc<Headers>,
+    pub server_headers: Arc<Headers>,
    pub config: Arc<AppConfig>,
    pub extraparams: Arc<ArcSwap<Extraparams>>,
 }

 pub struct Context {
-    backend_id: String,
+    backend_id: Arc<str>,
+    // backend_id: Arc<(IpAddr, u16, bool)>,
    to_https: bool,
-    redirect_to: String,
+    redirect_to: Arc<str>,
    start_time: Instant,
-    hostname: Option<String>,
-    upstream_peer: Option<InnerMap>,
+    hostname: Option<Arc<str>>,
+    upstream_peer: Option<Arc<InnerMap>>,
    extraparams: arc_swap::Guard<Arc<Extraparams>>,
+    client_headers: Arc<Vec<(Arc<str>, Arc<str>)>>,
 }

 #[async_trait]
@@ -45,20 +49,21 @@ impl ProxyHttp for LB {
    type CTX = Context;
    fn new_ctx(&self) -> Self::CTX {
        Context {
-            backend_id: String::new(),
+            backend_id: Arc::from(""),
            to_https: false,
-            redirect_to: String::new(),
+            redirect_to: Arc::from(""),
            start_time: Instant::now(),
            hostname: None,
            upstream_peer: None,
            extraparams: self.extraparams.load(),
+            client_headers: Arc::new(Vec::new()),
        }
    }
    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());
@@ -66,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;
@@ -89,7 +94,7 @@ impl ProxyHttp for LB {
            None => return Ok(false),
            Some(host) => {
                // let optioninnermap = self.get_host(host.as_str(), host.as_str(), backend_id);
-                let optioninnermap = self.get_host(host.as_str(), session.req_header().uri.path(), backend_id);
+                let optioninnermap = self.get_host(host, session.req_header().uri.path(), backend_id);
                match optioninnermap {
                    None => return Ok(false),
                    Some(ref innermap) => {
@@ -116,54 +121,46 @@ impl ProxyHttp for LB {
        Ok(false)
    }
    async fn upstream_peer(&self, session: &mut Session, ctx: &mut Self::CTX) -> Result<Box<HttpPeer>> {
-        // let host_name = return_header_host(&session);
        match ctx.hostname.as_ref() {
-            Some(hostname) => {
-                match ctx.upstream_peer.as_ref() {
-                    // Some((address, port, ssl, is_h2, to_https)) => {
-                    Some(innermap) => {
-                        let mut peer = Box::new(HttpPeer::new((innermap.address.clone(), innermap.port.clone()), innermap.is_ssl, String::new()));
-                        // if session.is_http2() {
-                        if innermap.is_http2 {
-                            peer.options.alpn = ALPN::H2;
-                        }
-                        if innermap.is_ssl {
-                            peer.sni = hostname.clone();
-                            peer.options.verify_cert = false;
-                            peer.options.verify_hostname = false;
-                        }
-                        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 = format!("https://{}:{}{}", host, port, uri);
-                                        }
-                                    }
+            Some(hostname) => match ctx.upstream_peer.as_ref() {
+                Some(innermap) => {
+                    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;
+                    }
+                    if innermap.is_ssl {
+                        peer.sni = hostname.to_string();
+                        peer.options.verify_cert = false;
+                        peer.options.verify_hostname = false;
+                    }
+                    if ctx.to_https || innermap.to_https {
+                        if let Some(stream) = session.stream() {
+                            if stream.get_ssl().is_none() {
+                                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));
                                }
                            }
                        }
-
-                        ctx.backend_id = format!("{}:{}:{}", innermap.address.clone(), innermap.port.clone(), innermap.is_ssl);
-                        Ok(peer)
-                    }
-                    None => {
-                        if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
-                            error!("Failed to send error response: {:?}", e);
-                        }
-                        Err(Box::new(Error {
-                            etype: HTTPStatus(502),
-                            esource: Upstream,
-                            retry: RetryType::Decided(false),
-                            cause: None,
-                            context: Option::from(ImmutStr::Static("Upstream not found")),
-                        }))
                    }
+                    ctx.backend_id = Arc::from(format!("{}:{}:{}", innermap.address, innermap.port, innermap.is_ssl));
+                    Ok(peer)
                }
-            }
+                None => {
+                    if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
+                        error!("Failed to send error response: {:?}", e);
+                    }
+                    Err(Box::new(Error {
+                        etype: HTTPStatus(502),
+                        esource: Upstream,
+                        retry: RetryType::Decided(false),
+                        cause: None,
+                        context: Option::from(ImmutStr::Static("Upstream not found")),
+                    }))
+                }
+            },
            None => {
                // session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await.expect("Failed to send error");
                if let Err(e) = session.respond_error_with_body(502, Bytes::from("502 Bad Gateway\n")).await {
@@ -180,63 +177,44 @@ impl ProxyHttp for LB {
        }
    }

-    async fn upstream_request_filter(&self, _session: &mut Session, upstream_request: &mut RequestHeader, ctx: &mut Self::CTX) -> Result<()> {
+    async fn upstream_request_filter(&self, session: &mut Session, upstream_request: &mut RequestHeader, ctx: &mut Self::CTX) -> Result<()> {
        if let Some(hostname) = ctx.hostname.as_ref() {
-            upstream_request.insert_header("Host", hostname)?;
+            upstream_request.insert_header("Host", hostname.as_ref())?;
        }
        if let Some(peer) = ctx.upstream_peer.as_ref() {
-            upstream_request.insert_header("X-Forwarded-For", peer.address.as_str())?;
+            upstream_request.insert_header("X-Forwarded-For", peer.address.to_string())?;
        }
+
+        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, v) in server_headers.iter() {
+                    upstream_request.insert_header(k.to_string(), v.as_ref())?;
+                }
+            }
+            if let Some(client_headers) = headers.client_headers {
+                ctx.client_headers = Arc::new(client_headers);
+            }
+        }
+
        Ok(())
    }
-
-    // async fn request_body_filter(&self, _session: &mut Session, _body: &mut Option<Bytes>, _end_of_stream: bool, _ctx: &mut Self::CTX) -> Result<()>
-    // where
-    //     Self::CTX: Send + Sync,
-    // {
-    //     Ok(())
-    // }
    async fn response_filter(&self, session: &mut Session, _upstream_response: &mut ResponseHeader, ctx: &mut Self::CTX) -> Result<()> {
-        // _upstream_response.insert_header("X-Proxied-From", "Fooooooooooooooo").unwrap();
        if ctx.extraparams.sticky_sessions {
-            let backend_id = ctx.backend_id.clone();
-            if let Some(bid) = self.ump_byid.get(&backend_id) {
+            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));
            }
        }
        if ctx.to_https {
            let mut redirect_response = ResponseHeader::build(StatusCode::MOVED_PERMANENTLY, None)?;
-            redirect_response.insert_header("Location", ctx.redirect_to.clone())?;
+            redirect_response.insert_header("Location", ctx.redirect_to.as_ref())?;
            redirect_response.insert_header("Content-Length", "0")?;
            session.write_response_header(Box::new(redirect_response), false).await?;
        }
-        match ctx.hostname.as_ref() {
-            Some(host) => {
-                let path = session.req_header().uri.path();
-                let host_header = host;
-                let split_header = host_header.split_once(':');

-                match split_header {
-                    Some(sh) => {
-                        let yoyo = self.get_header(sh.0, path);
-                        for k in yoyo.iter() {
-                            for t in k.iter() {
-                                _upstream_response.insert_header(t.0.clone(), t.1.clone()).unwrap();
-                            }
-                        }
-                    }
-                    None => {
-                        let yoyo = self.get_header(host_header, path);
-                        for k in yoyo.iter() {
-                            for t in k.iter() {
-                                _upstream_response.insert_header(t.0.clone(), t.1.clone()).unwrap();
-                            }
-                        }
-                    }
-                }
-            }
-            None => {}
+        for (k, v) in ctx.client_headers.iter() {
+            _upstream_response.insert_header(k.to_string(), v.as_ref())?;
        }
+
        session.set_keepalive(Some(300));
        Ok(())
    }
@@ -245,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<String> {
-    if session.is_http2() {
-        match session.req_header().uri.host() {
-            Some(host) => Option::from(host.to_string()),
-            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 = host.to_str().unwrap().splitn(2, ':').collect::<Vec<&str>>();
-                Option::from(header_host[0].to_string())
-            }
-            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())
 }
--- a/src/web/start.rs
+++ b/src/web/start.rs
@@ -27,7 +27,8 @@ pub fn run() {
    let uf_config = Arc::new(DashMap::new());
    let ff_config = Arc::new(DashMap::new());
    let im_config = Arc::new(DashMap::new());
-    let hh_config = Arc::new(DashMap::new());
+    let ch_config = Arc::new(DashMap::new());
+    let sh_config = Arc::new(DashMap::new());

    let ec_config = Arc::new(ArcSwap::from_pointee(Extraparams {
        sticky_sessions: false,
@@ -43,7 +44,8 @@ pub fn run() {
        ump_full: ff_config,
        ump_byid: im_config,
        config: cfg.clone(),
-        headers: hh_config,
+        client_headers: ch_config,
+        server_headers: sh_config,
        extraparams: ec_config,
    };

--- a/src/web/webserver.rs
+++ b/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()
+}
Author	SHA1	Message	Date
Ara Sadoyan	2b437c65fb	Performance improvement. String removal from hot paths.	2026-01-27 16:19:51 +01:00
Ara Sadoyan	38055ae94e	added new metric aralez_requests_by_upstream	2026-01-25 18:08:15 +01:00
Ara Sadoyan	703de9e909	updates on API server https://sadoyan.github.io/aralez-docs/assets/api/	2026-01-22 16:50:51 +01:00
Ara Sadoyan	2c8b01295c	Minor subfunction removal	2026-01-21 20:01:16 +01:00
Ara Sadoyan	baebe1c00f	Async apply of config via API	2026-01-20 19:16:27 +01:00
Ara Sadoyan	6c1d3c5ef8	Error handling on API server	2026-01-09 18:44:36 +01:00
Ara Sadoyan	2d1a827007	Removed unneeded loop	2025-12-14 12:09:11 +01:00
Ara Sadoyan	a2a5250711	Performance improvements on data types .	2025-12-11 15:21:34 +01:00
Ara Sadoyan	985e923342	to https redirect bug fix	2025-12-11 13:37:40 +01:00
Ara Sadoyan	0fc79c022f	perf: optimize header handling and concurrent access patterns	2025-12-10 19:09:04 +01:00
Ara Sadoyan	a43bccdfb8	minor, performance improvements	2025-11-28 13:13:15 +01:00
Ara Sadoyan	5b87391fbb	some more type changes, performance improvements	2025-11-27 18:47:04 +01:00
Ara Sadoyan	c68a4ad83d	Type changes, performance improvements	2025-11-27 18:03:34 +01:00
Ara Sadoyan	8ba8d32df1	Performance improvements, type changes	2025-11-26 12:12:41 +01:00
Ara Sadoyan	7a839065e6	update on kubernetes web client	2025-11-24 17:57:44 +01:00
Ara Sadoyan	74821654f3	Added support to send custom headers to upstream servers.	2025-11-22 23:18:06 +01:00
Ara Sadoyan	78c83b802f	Merge Consul & Kubernetes discovery	2025-10-26 15:26:09 +01:00
Ara Sadoyan	012505b77e	Cleaning up the code	2025-10-24 15:27:15 +02:00
Ara Sadoyan	21c4cb0901	Update README.md	2025-10-18 11:49:51 +02:00
Ara Sadoyan	86dd3d3402	README update	2025-10-18 11:48:48 +02:00
Ara Sadoyan	d6b345202b	README update	2025-10-17 17:03:45 +02:00
Ara Sadoyan	5209d787e4	README update	2025-10-17 16:44:57 +02:00