freshlybakedca.ke / patisserie
Your one-stop-cake-shop for everything Freshly Baked has to offer
fork atom

fix(m): wait for postgres connection

I woke up this morning to a dead menu instance and the following
backtrace:

Jan 05 04:46:24 teal menu-start[1351]: thread 'main' (1351) panicked at src/main.rs:173:6:
Jan 05 04:46:24 teal menu-start[1351]: Failed to connect to database defined in $DATABASE_URL: Io(Os { code: 2, kind: NotFound, message: "No such file or directory" })
Jan 05 04:46:24 teal menu-start[1351]: note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

It seems like this is because, when teal restarted, postgresql hadn't
created a socket by the time menu connected. Restarting menu after the
fact let it run Just Fine. Adding some retries should stop this problem
from coming up...

...a proper solution is probably to fix whatever decides that postgresql
is ready in packetmix, but this is much easier to locate and implement

authored by a.starrysky.fyi and committed by tangled.org 7d78472d 84c8d07e

github.yml
+42 -20
+42 -20
menu/src/main.rs
··· 13 13 use serde::Deserialize; 14 14 use sqlx::{Connection, PgConnection}; 15 15 use std::{collections::HashMap, env, ops::DerefMut, sync::OnceLock}; 16 - use tokio::sync::Mutex; 16 + use tokio::{ 17 + sync::Mutex, 18 + time::{Duration, sleep}, 19 + }; 17 20 use tower_http::normalize_path::NormalizePathLayer; 18 21 use tower_layer::Layer; 19 22 ··· 50 53 } 51 54 52 55 async fn get_redirect(default_location: &str, go: &str) -> Redirect { 53 - let redirect = sqlx::query!(r#"SELECT ("to") FROM direct WHERE "from" = $1 LIMIT 1"#, go.to_lowercase()) 54 - .fetch_one( 55 - STATE 56 - .get() 57 - .expect("Server must be initialized before processing connections") 58 - .sqlx_connection 59 - .lock() 60 - .await 61 - .deref_mut(), 62 - ) 63 - .await; 56 + let redirect = sqlx::query!( 57 + r#"SELECT ("to") FROM direct WHERE "from" = $1 LIMIT 1"#, 58 + go.to_lowercase() 59 + ) 60 + .fetch_one( 61 + STATE 62 + .get() 63 + .expect("Server must be initialized before processing connections") 64 + .sqlx_connection 65 + .lock() 66 + .await 67 + .deref_mut(), 68 + ) 69 + .await; 64 70 65 71 if let Ok(record) = redirect { 66 72 Redirect::temporary(&record.to) ··· 162 168 163 169 #[tokio::main] 164 170 async fn main() { 165 - let mut connection = PgConnection::connect( 166 - env::var("DATABASE_URL") 167 - .expect( 168 - "Please ensure you set your database URL in the $DATABASE_URL environment variable", 171 + let mut connection = { 172 + let mut maybe_connection; 173 + let mut tries = 3; 174 + loop { 175 + // We can't use a for loop here as rust doesn't know it will run at least once... 176 + tries -= 1; 177 + maybe_connection = PgConnection::connect( 178 + env::var("DATABASE_URL") 179 + .expect( 180 + "Please ensure you set your database URL in the $DATABASE_URL environment variable", 181 + ) 182 + .as_str(), 169 183 ) 170 - .as_str(), 171 - ) 172 - .await 173 - .expect("Failed to connect to database defined in $DATABASE_URL"); 184 + .await; 185 + 186 + if maybe_connection.is_ok() || tries == 0 { 187 + break; 188 + } 189 + 190 + sleep(Duration::from_secs(5)).await; 191 + } 192 + 193 + maybe_connection 194 + .expect("Failed to connect to database defined in $DATABASE_URL after 3 retries") 195 + }; 174 196 175 197 sqlx::migrate!() 176 198 .run(&mut connection)