tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rrd: move creation of serde value into api

Browse Source 
there is now a 'extract_cached_data' which just returns
the data of the specified field, and an api function that converts
a list of fields to the correct serde value

this way we do not have to create a serde value in rrd/cache.rs
(makes for a better interface)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-06-10 12:02:57 +02:00
committed by Wolfgang Bumiller
parent e693818afc
commit 431cc7b185
4 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/rrd/cache.rs
View File

@ -4,7 +4,6 @@ use std::sync::{RwLock};
use anyhow::{format_err, Error};
use lazy_static::lazy_static;
use serde_json::{json, Value};
use proxmox::tools::fs::{create_path, CreateOptions};
@ -103,41 +102,18 @@ pub fn extract_lists(
Ok((times, result))
}
pub fn extract_data(
pub fn extract_cached_data(
base: &str,
items: &[&str],
name: &str,
now: f64,
timeframe: RRDTimeFrameResolution,
mode: RRDMode,
) -> Result<Value, Error> {
let now = epoch_now_f64()?;
) -> Option<(u64, u64, Vec<Option<f64>>)> {
let map = RRD_CACHE.read().unwrap();
let mut result = Vec::new();
for name in items.iter() {
let rrd = match map.get(&format!("{}/{}", base, name)) {
Some(rrd) => rrd,
None => continue,
};
let (start, reso, list) = rrd.extract_data(now, timeframe, mode);
let mut t = start;
for index in 0..RRD_DATA_ENTRIES {
if result.len() <= index {
if let Some(value) = list[index] {
result.push(json!({ "time": t, *name: value }));
} else {
result.push(json!({ "time": t }));
}
} else {
if let Some(value) = list[index] {
result[index][name] = value.into();
}
}
t += reso;
}
match map.get(&format!("{}/{}", base, name)) {
Some(rrd) => Some(rrd.extract_data(now, timeframe, mode)),
None => None,
}
Ok(result.into())
}