0.29.7

src/balance/pool_core.rs

@@ -21,7 +21,7 @@ impl Pool {
             .zip(backends)
             .map(|(definition, backend)| {
                 Arc::new(Member {
-                    state: Arc::new(BackendState::new(settings.health_check.mode)),
+                    state: Arc::new(BackendState::new(settings.health_for(&definition).mode)),
                     definition,
                     backend,
                     token: rand::thread_rng()
@@ -54,13 +54,13 @@ impl Pool {
             let same_origin = serde_json::to_vec(&member.definition.backend()).ok()
                 == serde_json::to_vec(&old.definition.backend()).ok();
             let same_health =
-                serde_json::to_vec(&(&self.settings.health_check, &self.settings.passive_health))
-                    .ok()
-                    == serde_json::to_vec(&(
-                        &previous.settings.health_check,
-                        &previous.settings.passive_health,
-                    ))
-                    .ok();
+                serde_json::to_vec(&(
+                    self.settings.health_for(&member.definition),
+                    self.settings.passive_for(&member.definition),
+                )).ok() == serde_json::to_vec(&(
+                    previous.settings.health_for(&old.definition),
+                    previous.settings.passive_for(&old.definition),
+                )).ok();
             let same_clients = member.backend.client.reusable_with(&old.backend.client)
                 && member
                     .backend
@@ -195,8 +195,8 @@ impl Pool {
         Some(Selection {
             lease: Arc::new(Lease {
                 member: member.clone(),
-                health: self.settings.health_check.clone(),
-                passive_health: self.settings.passive_health.clone(),
+                health: self.settings.health_for(&member.definition),
+                passive_health: self.settings.passive_for(&member.definition),
                 error_recorded: AtomicBool::new(false),
             }),
             cookie: None,
@@ -336,8 +336,8 @@ impl Pool {
         Some(Selection {
             lease: Arc::new(Lease {
                 member: selected.clone(),
-                health: self.settings.health_check.clone(),
-                passive_health: self.settings.passive_health.clone(),
+                health: self.settings.health_for(&selected.definition),
+                passive_health: self.settings.passive_for(&selected.definition),
                 error_recorded: AtomicBool::new(false),
             }),
             cookie,