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

api: node/journal: fix parameter extraction of /nodes/node/journal

Browse Source 
by extracting them via the api macro into the function signature

this fixes an issue, where giving 'since' and 'until' where not
used since we tried to extract them as 'str' while they were numbers.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Dominik Csapak 2021-05-25 13:19:47 +02:00 committed by Thomas Lamprecht
parent 3a804a8a20
commit c24cb13382
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api2/node/journal.rs
View File

@ -60,36 +60,41 @@ use crate::config::acl::PRIV_SYS_AUDIT;
)] )]
/// Read syslog entries. /// Read syslog entries.
fn get_journal( fn get_journal(
param: Value, since: Option<i64>,
until: Option<i64>,
lastentries: Option<u64>,
startcursor: Option<String>,
endcursor: Option<String>,
_param: Value,
_info: &ApiMethod, _info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment, _rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let mut args = vec![]; let mut args = vec![];
if let Some(lastentries) = param["lastentries"].as_u64() { if let Some(lastentries) = lastentries {
args.push(String::from("-n")); args.push(String::from("-n"));
args.push(format!("{}", lastentries)); args.push(format!("{}", lastentries));
} }
if let Some(since) = param["since"].as_str() { if let Some(since) = since {
args.push(String::from("-b")); args.push(String::from("-b"));
args.push(since.to_owned()); args.push(since.to_string());
} }
if let Some(until) = param["until"].as_str() { if let Some(until) = until {
args.push(String::from("-e")); args.push(String::from("-e"));
args.push(until.to_owned()); args.push(until.to_string());
} }
if let Some(startcursor) = param["startcursor"].as_str() { if let Some(startcursor) = startcursor {
args.push(String::from("-f")); args.push(String::from("-f"));
args.push(startcursor.to_owned()); args.push(startcursor);
} }
if let Some(endcursor) = param["endcursor"].as_str() { if let Some(endcursor) = endcursor {
args.push(String::from("-t")); args.push(String::from("-t"));
args.push(endcursor.to_owned()); args.push(endcursor);
} }
let mut lines: Vec<String> = vec![]; let mut lines: Vec<String> = vec![];