Refactored db directory

This commit is contained in:
Benjamin Sherriff
2023-10-21 12:32:50 -04:00
parent 11facd9bad
commit 379de4bdb5
32 changed files with 124 additions and 67 deletions

View File

@@ -21,15 +21,15 @@ use dotenv::dotenv;
mod auth;
mod dnd;
mod bot;
mod db;
mod storage;
#[actix_web::main]
async fn main() -> std::io::Result<()> {
dotenv().ok();
env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "warn,siren=info"));
db::init();
storage::init();
match env::var("DATA_DIR_PATH") {
Ok(data_dir_path) => db::load_data(&data_dir_path),
Ok(data_dir_path) => dnd::load_data(&data_dir_path),
Err(err) => warn!("Unable to load initial database data: {}", err)
};
@@ -111,6 +111,11 @@ async fn main() -> std::io::Result<()> {
let host = env::var("SERVICE_HOST").unwrap_or("localhost".to_string());
let port = env::var("SERVICE_PORT").unwrap_or("5000".to_string());
match crate::storage::create_bucket("siren").await {
Ok(_) => {},
Err(err) => {}
};
let server = match HttpServer::new(move || {
let cors = Cors::default()
.allow_any_origin()
@@ -121,8 +126,8 @@ async fn main() -> std::io::Result<()> {
App::new()
.wrap(cors)
.app_data(web::Data::new(Arc::clone(&app_data)))
.configure(crate::db::messages::init_routes)
.configure(crate::db::spells::init_routes)
.configure(crate::storage::messages::init_routes)
.configure(crate::dnd::spells::init_routes)
.configure(crate::auth::init_routes)
.configure(crate::bot::api::init_routes)
})