chore (log): refactor

pull/633/head
mellbacon 2 years ago
parent 72d8f678e2
commit 8fce15a08b
No known key found for this signature in database
GPG Key ID: 6E067A4847F23797

@ -310,10 +310,12 @@ impl Builder {
plugin::Builder::new("log") plugin::Builder::new("log")
.invoke_handler(tauri::generate_handler![log]) .invoke_handler(tauri::generate_handler![log])
.setup(move |app_handle| { .setup(move |app_handle| {
let mut app_name = &app_handle.package_info().name; let log_name = if !self.log_name.is_empty() {
if !self.log_name.is_empty() { &self.log_name
app_name = &self.log_name;
} }
else {
&app_handle.package_info().name
};
// setup targets // setup targets
for target in &self.targets { for target in &self.targets {
self.dispatch = self.dispatch.chain(match target { self.dispatch = self.dispatch.chain(match target {
@ -326,7 +328,7 @@ impl Builder {
fern::log_file(get_log_file_path( fern::log_file(get_log_file_path(
&path, &path,
app_name, log_name,
&self.rotation_strategy, &self.rotation_strategy,
&self.timezone_strategy, &self.timezone_strategy,
self.max_file_size, self.max_file_size,
@ -341,7 +343,7 @@ impl Builder {
fern::log_file(get_log_file_path( fern::log_file(get_log_file_path(
&path, &path,
app_name, log_name,
&self.rotation_strategy, &self.rotation_strategy,
&self.timezone_strategy, &self.timezone_strategy,
self.max_file_size, self.max_file_size,
@ -375,12 +377,12 @@ impl Builder {
fn get_log_file_path( fn get_log_file_path(
dir: &impl AsRef<Path>, dir: &impl AsRef<Path>,
app_name: &str, log_name: &str,
rotation_strategy: &RotationStrategy, rotation_strategy: &RotationStrategy,
timezone_strategy: &TimezoneStrategy, timezone_strategy: &TimezoneStrategy,
max_file_size: u128, max_file_size: u128,
) -> plugin::Result<PathBuf> { ) -> plugin::Result<PathBuf> {
let path = dir.as_ref().join(format!("{app_name}.log")); let path = dir.as_ref().join(format!("{log_name}.log"));
if path.exists() { if path.exists() {
let log_size = File::open(&path)?.metadata()?.len() as u128; let log_size = File::open(&path)?.metadata()?.len() as u128;
@ -389,7 +391,7 @@ fn get_log_file_path(
RotationStrategy::KeepAll => { RotationStrategy::KeepAll => {
let to = dir.as_ref().join(format!( let to = dir.as_ref().join(format!(
"{}_{}.log", "{}_{}.log",
app_name, log_name,
timezone_strategy timezone_strategy
.get_now() .get_now()
.format( .format(

Loading…
Cancel
Save