Github/aralez
1
0
Fork 0
mirror of https://github.com/sadoyan/aralez.git synced 2026-10-23 06:01:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Ara Sadoyan
2026-06-27 12:32:41 +02:00
parent 4b6a558b4b 6c9c7acf65
commit aa22749393
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/gethosts.rs
+22 -11
View File
@@ -20,21 +20,22 @@ pub trait GetHost {
#[async_trait]
impl GetHost for LB {
fn get_host(&self, peer: &str, path: &str, backend_id: Option<&str>) -> Option<Arc<InnerMap>> {
if let Some(b) = backend_id {
if let Some(bb) = self.ump_byid.get(b) {
return Some(bb.value().clone());
}
}
let host_entry = self.ump_upst.get(peer)?;
let mut end = path.len();
loop {
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();
return Some(servers[idx].clone());
if let Some(b) = backend_id {
if let Some(bb) = self.ump_byid.get(b) {
let target = bb.value();
if servers.iter().any(|s| s.address == target.address && s.port == target.port) {
return Some(target.clone());
}
}
}
let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
return Some(servers[idx].clone());
}
if let Some(pos) = slice.rfind('/') {
end = pos;
@@ -45,10 +46,20 @@ impl GetHost for LB {
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());
if let Some(b) = backend_id {
if let Some(bb) = self.ump_byid.get(b) {
let target = bb.value();
if servers.iter().any(|s| s.address == target.address && s.port == target.port) {
return Some(target.clone());
}
}
}
let idx = index.fetch_add(1, Ordering::Relaxed) % servers.len();
return Some(servers[idx].clone());
}
}
}
None
}