diff --git a/api/Cargo.toml b/api/Cargo.toml index 9b40183..80dfd3c 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -12,6 +12,7 @@ futures-util = { version = "^0.3" } rocket = { version = "0.5.0-rc.2", features = [ "json", ] } +dotenv = "0.15.0" serde_json = { version = "^1" } diff --git a/api/src/pool.rs b/api/src/pool.rs index 69287ae..4b123bc 100644 --- a/api/src/pool.rs +++ b/api/src/pool.rs @@ -21,15 +21,21 @@ impl sea_orm_rocket::Pool for SeaOrmPool { type Connection = sea_orm::DatabaseConnection; async fn init(figment: &Figment) -> Result { - let config = figment.extract::().unwrap(); - let mut options: ConnectOptions = config.url.into(); + dotenv::dotenv().ok(); + let database_url = std::env::var("DATABASE_URL").unwrap(); + let mut options: ConnectOptions = database_url.into(); options + .max_connections(1024) + .min_connections(0) + .connect_timeout(Duration::from_secs(3)); + + /* options .max_connections(config.max_connections as u32) .min_connections(config.min_connections.unwrap_or_default()) .connect_timeout(Duration::from_secs(config.connect_timeout)); if let Some(idle_timeout) = config.idle_timeout { options.idle_timeout(Duration::from_secs(idle_timeout)); - } + } */ let conn = sea_orm::Database::connect(options).await?; Ok(SeaOrmPool { conn })