summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas O'Donnell <andytom@users.noreply.github.com>2021-05-18 23:30:00 +0200
committerGitHub <noreply@github.com>2021-05-18 23:30:00 +0200
commit1612212b63c8af10cf6a25f419235b6eef2f1699 (patch)
tree7e05775c5353b7f286a0e188e858e8d29299c870
parent1bef1da8d4ce5907c7dedee8d97d9f4a6e8ab50c (diff)
refactor(utils): Add extra logging to read_file (#2742)
Have added some additional logging to the `read_file` util to make debugging issues easier.
-rw-r--r--src/utils.rs21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/utils.rs b/src/utils.rs
index a70192e31..2c32c09a0 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,6 +1,7 @@
use process_control::{ChildExt, Timeout};
-use std::fs::File;
-use std::io::{Read, Result};
+use std::fmt::Debug;
+use std::fs::read_to_string;
+use std::io::Result;
use std::path::Path;
use std::process::{Command, Stdio};
use std::time::{Duration, Instant};
@@ -8,12 +9,18 @@ use std::time::{Duration, Instant};
use crate::context::Shell;
/// Return the string contents of a file
-pub fn read_file<P: AsRef<Path>>(file_name: P) -> Result<String> {
- let mut file = File::open(file_name)?;
- let mut data = String::new();
+pub fn read_file<P: AsRef<Path> + Debug>(file_name: P) -> Result<String> {
+ log::trace!("Trying to read from {:?}", file_name);
- file.read_to_string(&mut data)?;
- Ok(data)
+ let result = read_to_string(file_name);
+
+ if result.is_err() {
+ log::debug!("Error reading file: {:?}", result);
+ } else {
+ log::trace!("File read sucessfully");
+ };
+
+ result
}
#[derive(Debug, Clone)]