Merge upstream changes into local fork

jmeagher · Jan 27, 2023 · 0136833 · 0136833
2 parents d571376 + fbe256c
commit 0136833
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 102 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ async-trait = "0.1"
 rand = "0.8"
 chrono = "0.4"
 sha-1 = "0.10"
-toml = "0.5"
+toml = "0.6"
 serde = "1"
 serde_derive = "1"
 regex = "1"

diff --git a/src/admin.rs b/src/admin.rs
@@ -286,7 +286,7 @@ where
             for server in 0..pool.servers(shard) {
                 let address = pool.address(shard, server);
                 let pool_state = pool.pool_state(shard, server);
-                let banned = pool.is_banned(address, Some(address.role));
+                let banned = pool.is_banned(address);
 
                 res.put(data_row(&vec![
                     address.name(),                         // name