matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add detailed comments on how the logger works

Browse source
This commit is contained in:
Matthias Beyer 2018-10-10 23:17:19 +02:00
parent 3c801a264d
commit 3090a65446
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/core/libimagrt/src/logger.rs
View file

@ -174,28 +174,35 @@ impl Log for ImagLogger {
self.module_settings self.module_settings
.get(record_target) .get(record_target)
.map(|module_setting| { .map(|module_setting| {
// We have a module setting some
// * Check whether logging is enabled for this module and
// * check whether the module logging level is >= or, if there is no module logging
// level,
// * check whether the global logging level is >= the record level.
let set = module_setting.enabled && let set = module_setting.enabled &&
module_setting.level.unwrap_or(self.global_loglevel) >= record.level(); module_setting.level.unwrap_or(self.global_loglevel) >= record.level();
if set { if set { // if we want to log from a setting standpoint
// get the destinations for the module and log to all of them
module_setting.destinations.as_ref().map(|destinations| for d in destinations { module_setting.destinations.as_ref().map(|destinations| for d in destinations {
// If there's an error, we cannot do anything, can we? let _ = log_to_destination(&d); // ignore errors, because what else?
let _ = log_to_destination(&d);
}); });
// after that, log to the global destinations as well
for d in self.global_destinations.iter() { for d in self.global_destinations.iter() {
// If there's an error, we cannot do anything, can we? let _ = log_to_destination(&d); // ignore errors, because what else?
let _ = log_to_destination(&d);
} }
} }
}) })
// if we do not have a setting for the record target
.unwrap_or_else(|| { .unwrap_or_else(|| {
if self.global_loglevel >= record.level() { if self.global_loglevel >= record.level() { // if logging is enabled for that level
// Yes, we log self.global_destinations
for d in self.global_destinations.iter() { .iter()
// If there's an error, we cannot do anything, can we? .for_each(|d| { // log to all global destinations
let _ = log_to_destination(&d); let _ = log_to_destination(&d); // ignore errors, because what else?
} });
} }
}); });
} }
@ -287,14 +294,14 @@ fn translate_destinations(raw: &Vec<Value>) -> Result<Vec<LogDestination>> {
fn aggregate_global_destinations(matches: &ArgMatches, config: Option<&Value>) fn aggregate_global_destinations(matches: &ArgMatches, config: Option<&Value>)
-> Result<Vec<LogDestination>> -> Result<Vec<LogDestination>>
{ {
let config_log_dest_path = "imag.logging.destinations";
match config { match config {
Some(cfg) => cfg Some(cfg) => cfg
.read("imag.logging.destinations")? .read(&config_log_dest_path)?
.ok_or_else(|| RE::from_kind(EK::GlobalDestinationConfigMissing))? .ok_or_else(|| RE::from_kind(EK::GlobalDestinationConfigMissing))?
.as_array() .as_array()
.ok_or_else(|| { .ok_or_else(|| {
let path = "imag.logging.destinations".to_owned(); let path = config_log_dest_path.to_owned();
let ty = "Array"; let ty = "Array";
RE::from_kind(EK::ConfigTypeError(path, ty)) RE::from_kind(EK::ConfigTypeError(path, ty))
}) })