magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: split database into multiple files, more error handling, cleaner code

Browse source
This commit is contained in:
timokoesters 2020-05-03 17:25:31 +02:00
parent 4b191a9311
commit 8f67c01efd
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
17 changed files with 1573 additions and 1630 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main.rs
View file

@ -1,8 +1,9 @@
#![feature(proc_macro_hygiene, decl_macro)]
#![warn(rust_2018_idioms)]
mod client_server;
mod data;
mod database;
mod error;
mod pdu;
mod ruma_wrapper;
mod server_server;
@ -11,8 +12,8 @@ mod utils;
#[cfg(test)]
mod test;
pub use data::Data;
pub use database::Database;
pub use error::{Error, Result};
pub use pdu::PduEvent;
pub use ruma_wrapper::{MatrixResult, Ruma};
@ -75,7 +76,7 @@ fn setup_rocket() -> rocket::Rocket {
)
.attach(AdHoc::on_attach("Config", |rocket| {
let hostname = rocket.config().get_str("hostname").unwrap_or("localhost");
let data = Data::load_or_create(&hostname);
let data = Database::load_or_create(&hostname);
Ok(rocket.manage(data))
}))
@ -86,7 +87,6 @@ fn main() {
if let Err(_) = std::env::var("RUST_LOG") {
std::env::set_var("RUST_LOG", "warn");
}
pretty_env_logger::init();
setup_rocket().launch().unwrap();
}