mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 421 - clearer debug messages when doing things (#422)

Browse source
This commit is contained in:
James Hodgkinson 2021-04-25 11:35:36 +10:00 committed by GitHub
parent 6f222f6408
commit 01e9aa982d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kanidm_tools/src/cli/login.rs
View file

@ -21,11 +21,15 @@ pub fn read_tokens() -> Result<BTreeMap<String, String>, ()> {
return Ok(BTreeMap::new());
}
debug!("Attempting to read tokens from {:?}", &token_path);
// If the file does not exist, return Ok<map>
let file = match File::open(&token_path) {
Ok(f) => f,
Err(e) => {
warn!("Can not read from {}, continuing ... {:?}", TOKEN_PATH, e);
warn!(
"Cannot read tokens from {} due to error: {:?} ... continuing.",
TOKEN_PATH, e
);
return Ok(BTreeMap::new());
}
};
@ -33,7 +37,10 @@ pub fn read_tokens() -> Result<BTreeMap<String, String>, ()> {
// Else try to read
serde_json::from_reader(reader).map_err(|e| {
error!("JSON/IO error -> {:?}", e);
error!(
"JSON/IO error reading tokens from {:?} -> {:?}",
&token_path, e
);
})
}
@ -76,7 +83,10 @@ pub fn write_tokens(tokens: &BTreeMap<String, String>) -> Result<(), ()> {
let writer = BufWriter::new(file);
serde_json::to_writer_pretty(writer, tokens).map_err(|e| {
error!("JSON/IO error -> {:?}", e);
error!(
"JSON/IO error writing tokens to file {:?} -> {:?}",
&token_path, e
);
})
}