saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-10-31 10:18:19 +02:00
Code Issues Packages Projects 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
parent 44da9e6ca7 881524bd54
commit a5ba67fef2
1 changed files with 3 additions and 1 deletions
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;