Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Total WIP - try making Db a generic struct instead of a trait

Browse source
This commit is contained in:
Max Brunsfeld 2022-11-09 19:28:06 -08:00
parent 7e02ac772a
commit bed06346d1
4 changed files with 133 additions and 902 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/collab/src/main.rs
View file

@ -13,7 +13,7 @@ use crate::rpc::ResultExt as _;
use anyhow::anyhow;
use axum::{routing::get, Router};
use collab::{Error, Result};
use db::{Db, RealDb};
use db::DefaultDb as Db;
use serde::Deserialize;
use std::{
env::args,
@ -49,14 +49,14 @@ pub struct MigrateConfig {
}
pub struct AppState {
db: Arc<dyn Db>,
db: Arc<Db>,
live_kit_client: Option<Arc<dyn live_kit_server::api::Client>>,
config: Config,
}
impl AppState {
async fn new(config: Config) -> Result<Arc<Self>> {
let db = RealDb::new(&config.database_url, 5).await?;
let db = Db::new(&config.database_url, 5).await?;
let live_kit_client = if let Some(((server, key), secret)) = config
.live_kit_server
.as_ref()
@ -96,7 +96,7 @@ async fn main() -> Result<()> {
}
Some("migrate") => {
let config = envy::from_env::<MigrateConfig>().expect("error loading config");
let db = RealDb::new(&config.database_url, 5).await?;
let db = Db::new(&config.database_url, 5).await?;
let migrations_path = config
.migrations_path