Skip to content

Commit

Permalink
Update sync.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
@donnie4w
donnie4w committed Dec 29, 2024
1 parent fc4f2ae commit 08b2ebc
Showing 1 changed file with 153 additions and 18 deletions.
171 changes: 153 additions & 18 deletions src/sync.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ impl Logger {

pub fn print(&mut self, level: LEVEL, module: &str, message: &str) {
let mut console = String::new();
let mut msg =String::new();
let mut msg = String::new();
let mut is_bodyfmt = false;

if let Some(f) = &self.attrfmt.bodyfmt {
is_bodyfmt = true;
msg = f(level, message.to_string());
Expand All @@ -121,10 +121,34 @@ impl Logger {
}
if filename != "" {
if *filename == self.filehandle.0 {
let _ = self.filehandle.1.print(is_mod_console,if is_mod_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_mod_console,
if is_mod_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
} else {
if let Some(fm) = self.fmap.get_mut(filename) {
let _ = fm.print(is_mod_console,if is_mod_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = fm.print(
is_mod_console,
if is_mod_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}
}
return;
Expand All @@ -139,7 +163,7 @@ impl Logger {
let mut is_consolefmt = false;
if let Some(cs) = lo.console {
is_level_console = cs;
if is_level_console && console.is_empty(){
if is_level_console && console.is_empty() {
if let Some(f) = &self.attrfmt.console_bodyfmt {
is_consolefmt = true;
console = f(level, message.to_string());
Expand All @@ -148,34 +172,70 @@ impl Logger {
}
if filename != "" {
if *filename == self.filehandle.0 {
let _ = self.filehandle.1.print(is_level_console,if is_level_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_level_console,
if is_level_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
} else {
if let Some(fm) = self.fmap.get_mut(filename) {
let _ = fm.print(is_level_console,if is_level_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = fm.print(
is_level_console,
if is_level_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}
}
return;
}
}
}

let is_console = self.fmthandle.get_console();
let is_console = self.fmthandle.get_console();
let mut is_consolefmt = false;
if is_console && console.is_empty() {
if let Some(f) = &self.attrfmt.console_bodyfmt {
is_consolefmt = true;
console = f(level, message.to_string());
}
}
let _ = self.filehandle.1.print(is_console,if is_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_console,
if is_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}

pub fn safeprint(&mut self, level: LEVEL, module: &str, message: &str) {
let _guard = self.mutex.lock().expect("Failed to acquire lock");
let mut console = String::new();
let mut msg =String::new();
let mut msg = String::new();
let mut is_bodyfmt = false;

if let Some(f) = &self.attrfmt.bodyfmt {
is_bodyfmt = true;
msg = f(level, message.to_string());
Expand All @@ -197,10 +257,34 @@ impl Logger {
}
if filename != "" {
if *filename == self.filehandle.0 {
let _ = self.filehandle.1.print(is_mod_console,if is_mod_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_mod_console,
if is_mod_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
} else {
if let Some(fm) = self.fmap.get_mut(filename) {
let _ = fm.print(is_mod_console,if is_mod_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = fm.print(
is_mod_console,
if is_mod_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}
}
return;
Expand All @@ -215,7 +299,7 @@ impl Logger {
let mut is_consolefmt = false;
if let Some(cs) = lo.console {
is_level_console = cs;
if is_level_console && console.is_empty(){
if is_level_console && console.is_empty() {
if let Some(f) = &self.attrfmt.console_bodyfmt {
is_consolefmt = true;
console = f(level, message.to_string());
Expand All @@ -224,26 +308,62 @@ impl Logger {
}
if filename != "" {
if *filename == self.filehandle.0 {
let _ = self.filehandle.1.print(is_level_console,if is_level_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_level_console,
if is_level_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
} else {
if let Some(fm) = self.fmap.get_mut(filename) {
let _ = fm.print(is_level_console,if is_level_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = fm.print(
is_level_console,
if is_level_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}
}
return;
}
}
}

let is_console = self.fmthandle.get_console();
let is_console = self.fmthandle.get_console();
let mut is_consolefmt = false;
if is_console && console.is_empty() {
if let Some(f) = &self.attrfmt.console_bodyfmt {
is_consolefmt = true;
console = f(level, message.to_string());
}
}
let _ = self.filehandle.1.print(is_console,if is_console{if is_consolefmt{console.as_str()}else{""}}else{""} , if is_bodyfmt{msg.as_str()}else{message});
let _ = self.filehandle.1.print(
is_console,
if is_console {
if is_consolefmt {
console.as_str()
} else {
""
}
} else {
""
},
if is_bodyfmt { msg.as_str() } else { message },
);
}

pub fn log(&self, level: LEVEL, module: String, message: String) {
Expand Down Expand Up @@ -362,6 +482,14 @@ impl Logger {
self
}

pub fn set_cutmode_by_mixed(&mut self, filename: &str, maxsize: u64, mode: MODE, maxbackups: u32, compress: bool) -> &mut Self {
let ftm = FileOptionType::new(crate::CUTMODE::MIXED, mode, filename, maxsize, maxbackups, compress);
let fh = FileHandler::new(Box::new(ftm));
self.filehandle.0 = filename.to_string();
self.filehandle.1.set_file_handler(fh.unwrap());
self
}

pub fn set_option(&mut self, option: LogOption) -> &mut Self {
if let Some(v) = option.console {
self.fmthandle.set_console(v);
Expand Down Expand Up @@ -528,6 +656,13 @@ impl Log {
self
}

pub fn set_cutmode_by_mixed(&self, filename: &str, maxsize: u64, mode: MODE, maxbackups: u32, compress: bool) -> &Self {
unsafe {
synclog.set_cutmode_by_mixed(filename, maxsize, mode, maxbackups, compress);
}
self
}

pub fn set_option(&self, option: LogOption) -> &Self {
unsafe {
synclog.set_option(option);
Expand Down

0 comments on commit 08b2ebc

Please sign in to comment.