octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-12-23 19:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some format changes to main.rs

Browse Source
This commit is contained in:
Daniel García 2020-06-15 23:40:39 +02:00
parent a2411eef56
commit a87646b8cb
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.rs
View File

@ -17,11 +17,13 @@ extern crate diesel;
extern crate diesel_migrations; extern crate diesel_migrations;
use std::{ use std::{
fmt, // For panic logging
fs::create_dir_all, fs::create_dir_all,
panic,
path::Path, path::Path,
process::{exit, Command}, process::{exit, Command},
str::FromStr, str::FromStr,
panic, thread, fmt // For panic logging thread,
}; };
#[macro_use] #[macro_use]
@ -178,15 +180,13 @@ fn init_logging(level: log::LevelFilter) -> Result<(), fern::InitError> {
Shim(backtrace) Shim(backtrace)
); );
} }
None => { None => error!(
error!( target: "panic",
target: "panic", "thread '{}' panicked at '{}'{:?}",
"thread '{}' panicked at '{}'{:?}", thread,
thread, msg,
msg, Shim(backtrace)
Shim(backtrace) ),
)
}
} }
})); }));
@ -336,14 +336,11 @@ mod migrations {
} }
fn launch_rocket(extra_debug: bool) { fn launch_rocket(extra_debug: bool) {
// Create Rocket object, this stores current log level and sets its own
let rocket = rocket::ignite();
let basepath = &CONFIG.domain_path(); let basepath = &CONFIG.domain_path();
// If adding more paths here, consider also adding them to // If adding more paths here, consider also adding them to
// crate::utils::LOGGED_ROUTES to make sure they appear in the log // crate::utils::LOGGED_ROUTES to make sure they appear in the log
let rocket = rocket let result = rocket::ignite()
.mount(&[basepath, "/"].concat(), api::web_routes()) .mount(&[basepath, "/"].concat(), api::web_routes())
.mount(&[basepath, "/api"].concat(), api::core_routes()) .mount(&[basepath, "/api"].concat(), api::core_routes())
.mount(&[basepath, "/admin"].concat(), api::admin_routes()) .mount(&[basepath, "/admin"].concat(), api::admin_routes())
@ -354,9 +351,10 @@ fn launch_rocket(extra_debug: bool) {
.manage(api::start_notification_server()) .manage(api::start_notification_server())
.attach(util::AppHeaders()) .attach(util::AppHeaders())
.attach(util::CORS()) .attach(util::CORS())
.attach(util::BetterLogging(extra_debug)); .attach(util::BetterLogging(extra_debug))
.launch();
// Launch and print error if there is one // Launch and print error if there is one
// The launch will restore the original logging level // The launch will restore the original logging level
error!("Launch error {:#?}", rocket.launch()); error!("Launch error {:#?}", result);
} }