oxen-io
/
session-open-group-server
mirror of https://github.com/oxen-io/session-open-group-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the formatter happy

This commit is contained in:
nielsandriesse 2021-06-03 11:07:52 +10:00
parent a4cd0aa456
commit 8dd65e32dc
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/storage.rs
View File

@ -250,7 +250,12 @@ pub async fn prune_files(file_expiration: i64) {
// Get a database connection and open a transaction
let conn = match pool.get() {
Ok(conn) => conn,
Err(e) => return error!("Couldn't get database connection to prune files due to error: {}.", e),
Err(e) => {
return error!(
"Couldn't get database connection to prune files due to error: {}.",
e
)
}
};
// Get the IDs of the files to delete
let raw_query = format!("SELECT id FROM {} WHERE timestamp < (?1)", FILES_TABLE);
@ -261,7 +266,10 @@ pub async fn prune_files(file_expiration: i64) {
let rows = match query.query_map(params![expiration], |row| row.get(0)) {
Ok(rows) => rows,
Err(e) => {
return error!("Couldn't prune files due to error: {} (expiration = {}).", e, expiration);
return error!(
"Couldn't prune files due to error: {} (expiration = {}).",
e, expiration
);
}
};
let ids: Vec<String> = rows.filter_map(|result| result.ok()).collect();
@ -272,7 +280,10 @@ pub async fn prune_files(file_expiration: i64) {
match fs::remove_file(format!("files/{}_files/{}", room, id)) {
Ok(_) => deleted_ids.push(id),
Err(e) => {
error!("Couldn't delete file: {} from room: {} due to error: {}.", id, room, e);
error!(
"Couldn't delete file: {} from room: {} due to error: {}.",
id, room, e
);
deleted_ids.push(id);
}
}
@ -283,7 +294,9 @@ pub async fn prune_files(file_expiration: i64) {
let stmt = format!("DELETE FROM {} WHERE id = (?1)", FILES_TABLE);
match conn.execute(&stmt, params![id]) {
Ok(_) => (),
Err(e) => return error!("Couldn't prune file with ID: {} due to error: {}.", id, e),
Err(e) => {
return error!("Couldn't prune file with ID: {} due to error: {}.", id, e)
}
};
}
// Log the result