max
/
tauri-plugins-workspace
mirror of https://github.com/tauri-apps/plugins-workspace
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
pull/1511/head
Amr Bashir 11 months ago committed by GitHub
parent 81676da7ab
commit 862c42a457
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

26
plugins/log/src/lib.rs
Unescape View File

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

Write Preview
Loading…
Cancel
Save