MirrorHub/bitwarden_rs
0
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-12-14 17:43:46 +01:00
Code Issues Releases Wiki Activity

Merge branch 'BlackDex-alive-db-check' into main

Browse source
This commit is contained in:
Daniel García 2021-10-18 21:13:29 +02:00
commit a5ba67fef2
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/web.rs
View file

@ -64,8 +64,10 @@ fn attachments(uuid: SafeString, file_id: SafeString) -> Option<NamedFile> {
NamedFile::open(Path::new(&CONFIG.attachments_folder()).join(uuid).join(file_id)).ok() NamedFile::open(Path::new(&CONFIG.attachments_folder()).join(uuid).join(file_id)).ok()
} }
// We use DbConn here to let the alive healthcheck also verify the database connection.
use crate::db::DbConn;
#[get("/alive")] #[get("/alive")]
fn alive() -> Json<String> { fn alive(_conn: DbConn) -> Json<String> {
use crate::util::format_date; use crate::util::format_date;
use chrono::Utc; use chrono::Utc;