Skip to content

Commit 9d84d6f

Browse files
levkkzainkabani
andauthored
Graceful shutdown and refactor (#144)
* Graceful shutdown and refactor * ok * _Graceful_ shutdown * Remove hardcoded setting * clean up * end * timeout * hmm * hmm! * bash * bash * hmm * maybe maybe * Adds tests and move non-admin connection rejection to startup (#145) * Move error response * Adds tests and removes unused variable * Adds debug log Co-authored-by: zainkabani <[email protected]>
1 parent c054ff0 commit 9d84d6f

File tree

9 files changed

+588
-368
lines changed

9 files changed

+588
-368
lines changed

src/admin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ where
265265
for (_, pool) in get_all_pools() {
266266
let pool_config = pool.settings.clone();
267267
for shard in 0..pool.shards() {
268-
let database_name = &pool_config.shards[&shard.to_string()].database;
268+
let database_name = &pool.address(shard, 0).database;
269269
for server in 0..pool.servers(shard) {
270270
let address = pool.address(shard, server);
271271
let pool_state = pool.pool_state(shard, server);
272-
let banned = pool.is_banned(address, shard, Some(address.role));
272+
let banned = pool.is_banned(address, Some(address.role));
273273

274274
res.put(data_row(&vec![
275275
address.name(), // name

0 commit comments

Comments
 (0)