From 64e0786aa98ada1d332f60550e17aeef4b836619 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 21 May 2021 13:19:02 +0200 Subject: [PATCH] api: datastore status: refactor reused rrd get-data code into closure Nicer and shorter than just using a variable for the common parameters Signed-off-by: Thomas Lamprecht --- src/api2/status.rs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/api2/status.rs b/src/api2/status.rs index a6668c85..55f489f7 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -21,7 +21,7 @@ use crate::api2::types::{ Authid, }; -use crate::backup::{DataStore}; +use crate::backup::DataStore; use crate::config::datastore; use crate::tools::statistics::{linear_regression}; use crate::config::cached_user_info::CachedUserInfo; @@ -110,24 +110,17 @@ pub fn datastore_status( let rrd_dir = format!("datastore/{}", store); let now = proxmox::tools::time::epoch_f64(); - let rrd_resolution = RRDTimeFrameResolution::Month; - let rrd_mode = RRDMode::Average; - let total_res = crate::rrd::extract_cached_data( + let get_rrd = |what: &str| crate::rrd::extract_cached_data( &rrd_dir, - "total", + what, now, - rrd_resolution, - rrd_mode, + RRDTimeFrameResolution::Month, + RRDMode::Average, ); - let used_res = crate::rrd::extract_cached_data( - &rrd_dir, - "used", - now, - rrd_resolution, - rrd_mode, - ); + let total_res = get_rrd("total"); + let used_res = get_rrd("used"); if let (Some((start, reso, total_list)), Some((_, _, used_list))) = (total_res, used_res) { let mut usage_list: Vec = Vec::new();