mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2024-11-11 05:22:40 +01:00
Avoid some to_string in the request logging and include message to disable web vault when not found.
This commit is contained in:
parent
8ee0c57224
commit
36ae946655
@ -225,7 +225,9 @@ fn check_web_vault() {
|
||||
let index_path = Path::new(&CONFIG.web_vault_folder()).join("index.html");
|
||||
|
||||
if !index_path.exists() {
|
||||
error!("Web vault is not found. To install it, please follow the steps in https://github.com/dani-garcia/bitwarden_rs/wiki/Building-binary#install-the-web-vault");
|
||||
error!("Web vault is not found. To install it, please follow the steps in: ");
|
||||
error!("https://github.com/dani-garcia/bitwarden_rs/wiki/Building-binary#install-the-web-vault");
|
||||
error!("You can also set the environment variable 'WEB_VAULT_ENABLED=false' to disable it");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
16
src/util.rs
16
src/util.rs
@ -151,11 +151,13 @@ impl Fairing for BetterLogging {
|
||||
if !self.0 && method == Method::Options {
|
||||
return;
|
||||
}
|
||||
let mut uri = request.uri().to_string();
|
||||
uri.truncate(50);
|
||||
|
||||
if self.0 || LOGGED_ROUTES.iter().any(|r| uri.starts_with(r)) {
|
||||
info!(target: "request", "{} {}", method, uri);
|
||||
let uri = request.uri();
|
||||
let uri_path = uri.path();
|
||||
if self.0 || LOGGED_ROUTES.iter().any(|r| uri_path.starts_with(r)) {
|
||||
match uri.query() {
|
||||
Some(q) => info!(target: "request", "{} {}?{}", method, uri_path, &q[..q.len().min(30)]),
|
||||
None => info!(target: "request", "{} {}", method, uri_path),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -163,8 +165,8 @@ impl Fairing for BetterLogging {
|
||||
if !self.0 && request.method() == Method::Options {
|
||||
return;
|
||||
}
|
||||
let uri = request.uri().to_string();
|
||||
if self.0 || LOGGED_ROUTES.iter().any(|r| uri.starts_with(r)) {
|
||||
let uri_path = request.uri().path();
|
||||
if self.0 || LOGGED_ROUTES.iter().any(|r| uri_path.starts_with(r)) {
|
||||
let status = response.status();
|
||||
if let Some(ref route) = request.route() {
|
||||
info!(target: "response", "{} => {} {}", route, status.code, status.reason)
|
||||
|
Loading…
Reference in New Issue
Block a user