Pass DB connection string to ClientPool

Author: Kobzol

src/db.rs

@@ -28,6 +28,7 @@ lazy_static::lazy_static! {
 pub struct ClientPool {
     connections: Arc<Mutex<Vec<tokio_postgres::Client>>>,
     permits: Arc<Semaphore>,
+    db_url: String,
 }
 
 pub struct PooledClient {
@@ -59,10 +60,11 @@ impl std::ops::DerefMut for PooledClient {
 }
 
 impl ClientPool {
-    pub fn new() -> ClientPool {
+    pub fn new(db_url: String) -> ClientPool {
         ClientPool {
             connections: Arc::new(Mutex::new(Vec::with_capacity(16))),
             permits: Arc::new(Semaphore::new(16)),
+            db_url,
         }
     }
 
@@ -84,15 +86,14 @@ impl ClientPool {
         }
 
         PooledClient {
-            client: Some(make_client().await.unwrap()),
+            client: Some(make_client(&self.db_url).await.unwrap()),
             permit,
             pool: self.connections.clone(),
         }
     }
 }
 
-async fn make_client() -> anyhow::Result<tokio_postgres::Client> {
-    let db_url = std::env::var("DATABASE_URL").expect("needs DATABASE_URL");
+async fn make_client(db_url: &str) -> anyhow::Result<tokio_postgres::Client> {
     if db_url.contains("rds.amazonaws.com") {
         let mut builder = TlsConnector::builder();
         for cert in make_certificates() {

src/main.rs

@@ -242,7 +242,8 @@ async fn serve_req(
 }
 
 async fn run_server(addr: SocketAddr) -> anyhow::Result<()> {
-    let pool = db::ClientPool::new();
+    let db_url = std::env::var("DATABASE_URL").expect("needs DATABASE_URL");
+    let pool = db::ClientPool::new(db_url.clone());
     db::run_migrations(&mut *pool.get().await)
         .await
         .context("database migrations")?;
@@ -271,7 +272,7 @@ async fn run_server(addr: SocketAddr) -> anyhow::Result<()> {
 
     // Run all jobs that have a schedule (recurring jobs)
     if !is_scheduled_jobs_disabled() {
-        spawn_job_scheduler();
+        spawn_job_scheduler(db_url);
         spawn_job_runner(ctx.clone());
     }
 
@@ -361,11 +362,12 @@ async fn spawn_job_oneoffs(ctx: Arc<Context>) {
 /// The scheduler wakes up every `JOB_SCHEDULING_CADENCE_IN_SECS` seconds to
 /// check if there are any jobs ready to run. Jobs get inserted into the the
 /// database which acts as a queue.
-fn spawn_job_scheduler() {
+fn spawn_job_scheduler(db_url: String) {
     task::spawn(async move {
         loop {
+            let db_url = db_url.clone();
             let res = task::spawn(async move {
-                let pool = db::ClientPool::new();
+                let pool = db::ClientPool::new(db_url);
                 let mut interval =
                     time::interval(time::Duration::from_secs(JOB_SCHEDULING_CADENCE_IN_SECS));