tauri-apps/archived-tauri-plugin-log
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri-plugin-log.git synced 2026-01-31 00:35:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(log): propagate some errors and avoid unwrapping (#1294)

Browse Source 
Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/9745207996

Co-authored-by: FabianLars <FabianLars@users.noreply.github.com>
This commit is contained in:
Amr Bashir
2024-07-01 13:32:23 +00:00
committed by tauri-bot
parent 7b35a594d7
commit c6dd4820d6
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib.rs
View File

@@ -321,7 +321,7 @@ impl Builder {
LogTarget::Stderr => fern::Output::from(std::io::stderr()),
LogTarget::Folder(path) => {
if !path.exists() {
fs::create_dir_all(path).unwrap();
fs::create_dir_all(path)?;
}
fern::log_file(get_log_file_path(
@@ -334,9 +334,12 @@ impl Builder {
.into()
}
LogTarget::LogDir => {
let path = app_handle.path_resolver().app_log_dir().unwrap();
let path = app_handle
.path_resolver()
.app_log_dir()
.ok_or("app_log_dir is None")?;
if !path.exists() {
fs::create_dir_all(&path).unwrap();
fs::create_dir_all(&path)?;
}
fern::log_file(get_log_file_path(
@@ -358,7 +361,7 @@ impl Builder {
};
let app_handle = app_handle.clone();
tauri::async_runtime::spawn(async move {
app_handle.emit_all("log://log", payload).unwrap();
let _ = app_handle.emit_all("log://log", payload);
});
})
}
@@ -392,13 +395,9 @@ fn get_log_file_path(
log_name,
timezone_strategy
.get_now()
.format(
&time::format_description::parse(
"[year]-[month]-[day]_[hour]-[minute]-[second]"
)
.unwrap()
)
.unwrap(),
.format(&time::format_description::parse(
"[year]-[month]-[day]_[hour]-[minute]-[second]"
)?)?,
));
if to.is_file() {
// designated rotated log file name already exists
@@ -406,7 +405,10 @@ fn get_log_file_path(
let mut to_bak = to.clone();
to_bak.set_file_name(format!(
"{}.bak",
to_bak.file_name().unwrap().to_string_lossy()
to_bak
.file_name()
.map(|n| n.to_string_lossy())
.unwrap_or_default()
));
fs::rename(&to, to_bak)?;
}