Commitb0796ca

authored

Allow configuring dashboard connection pool settings (#635)

1 parent0b42fcc commitb0796caCopy full SHA for b0796ca

File tree

+31

-5

lines changed

+31

-5

lines changed

Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@ use guards::Cluster;`
`24`	`24`	`use responses::{BadRequest,ResponseOk};`
`25`	`25`	`use sqlx::Executor;`
`26`	`26`
	`27`	`+#[derive(Debug,Default,Clone)]`
	`28`	`+pubstructClustersSettings{`
	`29`	`+pubmax_connections:u32,`
	`30`	`+pubidle_timeout:u64,`
	`31`	`+pubmin_connections:u32,`
	`32`	`+}`
	`33`	`+`
`27`	`34`	`/// This struct contains information specific to the cluster being displayed in the dashboard.`
`28`	`35`	`///`
`29`	`36`	`/// The dashboard is built to manage multiple clusters, but the server itself by design is stateless.`
`@@ -44,13 +51,18 @@ pub struct Clusters {`
`44`	`51`	`}`
`45`	`52`
`46`	`53`	`implClusters{`
`47`		`-pubfnadd(&self,cluster_id:i64,database_url:&str) -> anyhow::Result<PgPool>{`
	`54`	`+pubfnadd(`
	`55`	`+&self,`
	`56`	`+cluster_id:i64,`
	`57`	`+database_url:&str,`
	`58`	`+settings:ClustersSettings,`
	`59`	`+) -> anyhow::Result<PgPool>{`
`48`	`60`	`letmut pools =self.pools.lock();`
`49`	`61`
`50`	`62`	`let pool =PgPoolOptions::new()`
`51`		`-.max_connections(5)`
`52`		`-.idle_timeout(std::time::Duration::from_millis(15_000))`
`53`		`-.min_connections(0)`
	`63`	`+.max_connections(settings.max_connections)`
	`64`	`+.idle_timeout(std::time::Duration::from_millis(settings.idle_timeout))`
	`65`	`+.min_connections(settings.min_connections)`
`54`	`66`	`.after_connect(\|conn, _meta\|{`
`55`	`67`	`Box::pin(asyncmove{`
`56`	`68`	`conn.execute("SET application_name = 'pgml_dashboard';")`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,18 @@ async fn main() {`
`11`	`11`	`dotenv::dotenv().ok();`
`12`	`12`
`13`	`13`	`let clusters = pgml_dashboard::Clusters::new();`
	`14`	`+let settings = pgml_dashboard::ClustersSettings{`
	`15`	`+min_connections:0,`
	`16`	`+max_connections:5,`
	`17`	`+idle_timeout:15_000,`
	`18`	`+};`
	`19`	`+`
`14`	`20`	`clusters`
`15`		`-.add(-1,&pgml_dashboard::guards::default_database_url())`
	`21`	`+.add(`
	`22`	`+ -1,`
	`23`	`+&pgml_dashboard::guards::default_database_url(),`
	`24`	`+ settings,`
	`25`	`+)`
`16`	`26`	`.unwrap();`
`17`	`27`
`18`	`28`	`pgml_dashboard::migrate(&clusters.get(-1).unwrap())`
`@@ -43,6 +53,10 @@ mod test {`
`43`	`53`	`use std::vec::Vec;`
`44`	`54`
`45`	`55`	`asyncfnrocket() ->Rocket<Build>{`
	`56`	`+let max_connections =5;`
	`57`	`+let min_connections =1;`
	`58`	`+let idle_timeout =15_000;`
	`59`	`+`
`46`	`60`	`let clusters =Clusters::new();`
`47`	`61`	`clusters`
`48`	`62`	`.add(-1,&pgml_dashboard::guards::default_database_url())`

Comments

(0)