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

src/tools.rs: file_get_json() - add new default parameter

Browse Source
This commit is contained in:
Dietmar Maurer
2019-04-04 12:24:18 +02:00
parent 79ad7b7ec2
commit 49cf9f3d0b
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/http_client.rs
View File

@ -33,7 +33,7 @@ fn store_ticket_info(server: &str, username: &str, ticket: &str, token: &str) ->
let mode = nix::sys::stat::Mode::from_bits_truncate(0o0600);
let mut data = tools::file_get_json(&path).unwrap_or(json!({}));
let mut data = tools::file_get_json(&path, Some(json!({})))?;
let now = Utc::now().timestamp();
@ -72,7 +72,10 @@ fn load_ticket_info(server: &str, username: &str) -> Option<(String, String)> {
_ => return None,
};
let data = tools::file_get_json(&path).unwrap_or(json!({}));
let data = match tools::file_get_json(&path, None) {
Ok(v) => v,
_ => return None,
};
let now = Utc::now().timestamp();