May 18, 2023 · May 18, 2023
diff --git a/pgml-dashboard/src/lib.rs b/pgml-dashboard/src/lib.rs
 use responses::{BadRequest, ResponseOk};
 use sqlx::Executor;

 #[derive(Debug, Default, Clone)]
 pub struct ClustersSettings {
    pub max_connections: u32,
    pub idle_timeout: u64,
    pub min_connections: u32,
 }

 /// This struct contains information specific to the cluster being displayed in the dashboard.
 ///
 /// The dashboard is built to manage multiple clusters, but the server itself by design is stateless.
 }

 impl Clusters {
    pub fn add(&self, cluster_id: i64, database_url: &str) -> anyhow::Result<PgPool> {
    pub fn add(
        &self,
        cluster_id: i64,
        database_url: &str,
        settings: ClustersSettings,
    ) -> anyhow::Result<PgPool> {
        let mut pools = self.pools.lock();

        let pool = PgPoolOptions::new()
            .max_connections(5)
            .idle_timeout(std::time::Duration::from_millis(15_000))
            .min_connections(0)
            .max_connections(settings.max_connections)
            .idle_timeout(std::time::Duration::from_millis(settings.idle_timeout))
            .min_connections(settings.min_connections)
            .after_connect(|conn, _meta| {
                Box::pin(async move {
                    conn.execute("SET application_name = 'pgml_dashboard';")
diff --git a/pgml-dashboard/src/main.rs b/pgml-dashboard/src/main.rs
    dotenv::dotenv().ok();

    let clusters = pgml_dashboard::Clusters::new();
    let settings = pgml_dashboard::ClustersSettings {
        min_connections: 0,
        max_connections: 5,
        idle_timeout: 15_000,
    };

    clusters
        .add(-1, &pgml_dashboard::guards::default_database_url())
        .add(
            -1,
            &pgml_dashboard::guards::default_database_url(),
            settings,
        )
        .unwrap();

    pgml_dashboard::migrate(&clusters.get(-1).unwrap())
    use std::vec::Vec;

    async fn rocket() -> Rocket<Build> {
        let max_connections = 5;
        let min_connections = 1;
        let idle_timeout = 15_000;

        let clusters = Clusters::new();
        clusters
            .add(-1, &pgml_dashboard::guards::default_database_url())
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,13 @@ use guards::Cluster;
		use responses::{BadRequest, ResponseOk};
		use sqlx::Executor;

		#[derive(Debug, Default, Clone)]
		pub struct ClustersSettings {
		pub max_connections: u32,
		pub idle_timeout: u64,
		pub min_connections: u32,
		}

		/// This struct contains information specific to the cluster being displayed in the dashboard.
		///
		/// The dashboard is built to manage multiple clusters, but the server itself by design is stateless.
Expand All		@@ -44,13 +51,18 @@ pub struct Clusters {
		}

		impl Clusters {
		pub fn add(&self, cluster_id: i64, database_url: &str) -> anyhow::Result<PgPool> {
		pub fn add(
		&self,
		cluster_id: i64,
		database_url: &str,
		settings: ClustersSettings,
		) -> anyhow::Result<PgPool> {
		let mut pools = self.pools.lock();

		let pool = PgPoolOptions::new()
		.max_connections(5)
		.idle_timeout(std::time::Duration::from_millis(15_000))
		.min_connections(0)
		.max_connections(settings.max_connections)
		.idle_timeout(std::time::Duration::from_millis(settings.idle_timeout))
		.min_connections(settings.min_connections)
		.after_connect(\|conn, _meta\| {
		Box::pin(async move {
		conn.execute("SET application_name = 'pgml_dashboard';")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,8 +11,18 @@ async fn main() {
		dotenv::dotenv().ok();

		let clusters = pgml_dashboard::Clusters::new();
		let settings = pgml_dashboard::ClustersSettings {
		min_connections: 0,
		max_connections: 5,
		idle_timeout: 15_000,
		};

		clusters
		.add(-1, &pgml_dashboard::guards::default_database_url())
		.add(
		-1,
		&pgml_dashboard::guards::default_database_url(),
		settings,
		)
		.unwrap();

		pgml_dashboard::migrate(&clusters.get(-1).unwrap())
Expand DownExpand Up		@@ -43,6 +53,10 @@ mod test {
		use std::vec::Vec;

		async fn rocket() -> Rocket<Build> {
		let max_connections = 5;
		let min_connections = 1;
		let idle_timeout = 15_000;

		let clusters = Clusters::new();
		clusters
		.add(-1, &pgml_dashboard::guards::default_database_url())
Expand Down