mCaptcha/survey
2
0
Fork 0
Code Issues 4 Pull requests 10 Projects Releases Packages Wiki Activity

feat: load settings in application context

Browse source
This commit is contained in:
Aravinth Manivannan 2023-01-24 19:01:30 +05:30
parent d5211cf946
commit 009ee5d11e
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/data.rs
View file

@ -22,13 +22,14 @@ use argon2_creds::{Config, ConfigBuilder, PasswordPolicy};
use sqlx::postgres::PgPoolOptions; use sqlx::postgres::PgPoolOptions;
use sqlx::PgPool; use sqlx::PgPool;
use crate::SETTINGS; use crate::settings::Settings;
/// App data /// App data
pub struct Data { pub struct Data {
/// databse pool /// database pool
pub db: PgPool, pub db: PgPool,
pub creds: Config, pub creds: Config,
pub settings: Settings,
} }
impl Data { impl Data {
@ -44,7 +45,7 @@ impl Data {
#[cfg(not(tarpaulin_include))] #[cfg(not(tarpaulin_include))]
/// create new instance of app data /// create new instance of app data
pub async fn new() -> Arc<Self> { pub async fn new(settings: Settings) -> Arc<Self> {
let creds = Self::get_creds(); let creds = Self::get_creds();
let c = creds.clone(); let c = creds.clone();
#[allow(unused_variables)] #[allow(unused_variables)]
@ -55,14 +56,18 @@ impl Data {
}); });
let db = PgPoolOptions::new() let db = PgPoolOptions::new()
.max_connections(SETTINGS.database.pool) .max_connections(settings.database.pool)
.connect(&SETTINGS.database.url) .connect(&settings.database.url)
.await .await
.expect("Unable to form database pool"); .expect("Unable to form database pool");
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]
init.join().unwrap(); init.join().unwrap();
let data = Data { db, creds }; let data = Data {
db,
creds,
settings,
};
Arc::new(data) Arc::new(data)
} }