Skip to content

Commit 2bbd106

Browse files
committed
db: Inline PoolState struct
1 parent cd89ab2 commit 2bbd106

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

src/db.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use diesel::prelude::*;
2-
use diesel::r2d2::{self, ConnectionManager, CustomizeConnection};
2+
use diesel::r2d2::{self, ConnectionManager, CustomizeConnection, State};
33
use prometheus::Histogram;
44
use secrecy::{ExposeSecret, SecretString};
55
use std::time::Duration;
@@ -75,12 +75,8 @@ impl DieselPool {
7575
}
7676
}
7777

78-
pub fn state(&self) -> PoolState {
79-
let state = self.pool.state();
80-
PoolState {
81-
connections: state.connections,
82-
idle_connections: state.idle_connections,
83-
}
78+
pub fn state(&self) -> State {
79+
self.pool.state()
8480
}
8581

8682
#[instrument(skip_all)]
@@ -97,12 +93,6 @@ impl DieselPool {
9793
}
9894
}
9995

100-
#[derive(Debug, Copy, Clone)]
101-
pub struct PoolState {
102-
pub connections: u32,
103-
pub idle_connections: u32,
104-
}
105-
10696
pub type DieselPooledConn = r2d2::PooledConnection<ConnectionManager<PgConnection>>;
10797

10898
pub fn oneoff_connection_with_config(

0 commit comments

Comments
 (0)