aboutsummaryrefslogtreecommitdiff
path: root/src/https.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-02 17:33:05 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-02 17:33:05 +0100
commitf163d1d348c78a27bb19a86a6158f4b5d1287f6f (patch)
treec4580fd02b2aa8bd3bdbcb0d77782f3d5343a1e8 /src/https.rs
parent3c5aa3680eab1989361026b96e4968b4cd92dcb5 (diff)
downloadtricot-f163d1d348c78a27bb19a86a6158f4b5d1287f6f.tar.gz
tricot-f163d1d348c78a27bb19a86a6158f4b5d1287f6f.zip
Don't do the hack with same_site and same_node, separate lb flags
Diffstat (limited to 'src/https.rs')
-rw-r--r--src/https.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/https.rs b/src/https.rs
index 3718bfd..49df11a 100644
--- a/src/https.rs
+++ b/src/https.rs
@@ -247,8 +247,8 @@ async fn select_target_and_proxy(
.as_ref()
.map(|x| x.len() as i32)
.unwrap_or(0),
- ent.same_node,
- ent.same_site,
+ (ent.flags.same_node || ent.flags.site_lb || ent.flags.global_lb),
+ (ent.flags.same_site || ent.flags.global_lb),
-ent.calls_in_progress.load(Ordering::SeqCst),
-ent.last_call.load(Ordering::SeqCst),
)
@@ -260,8 +260,8 @@ async fn select_target_and_proxy(
"target_addr",
proxy_to.target_addr.to_string(),
));
- tags.push(KeyValue::new("same_node", proxy_to.same_node));
- tags.push(KeyValue::new("same_site", proxy_to.same_site));
+ tags.push(KeyValue::new("same_node", proxy_to.flags.same_node));
+ tags.push(KeyValue::new("same_site", proxy_to.flags.same_site));
proxy_to.last_call.fetch_max(
(received_time - https_config.time_origin).as_millis() as i64,