matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

libimagrt: Replace read with typed read

Browse source
This commit is contained in:
Matthias Beyer 2018-01-12 16:31:13 +01:00
parent 47e98675e7
commit febecd85e5
1 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ use clap::ArgMatches;
use log::{Log, LogLevel, LogRecord, LogMetadata}; use log::{Log, LogLevel, LogRecord, LogMetadata};
use toml::Value; use toml::Value;
use toml_query::read::TomlValueReadExt; use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
use handlebars::Handlebars; use handlebars::Handlebars;
type ModuleName = String; type ModuleName = String;
@ -239,15 +240,9 @@ fn aggregate_global_loglevel(matches: &ArgMatches, config: Option<&Value>)
if let Some(cfg) = config { if let Some(cfg) = config {
let cfg_loglevel = cfg let cfg_loglevel = cfg
.read("imag.logging.level")? .read_string("imag.logging.level")?
.ok_or(RE::from_kind(EK::GlobalLogLevelConfigMissing))? .ok_or(RE::from_kind(EK::GlobalLogLevelConfigMissing))
.as_str() .and_then(|s| match_log_level_str(&s))?;
.ok_or_else(|| {
let path = "imag.logging.level".to_owned();
let ty = "String";
RE::from_kind(EK::ConfigTypeError(path, ty))
})
.and_then(match_log_level_str)?;
if let Some(cli_loglevel) = get_arg_loglevel(matches)? { if let Some(cli_loglevel) = get_arg_loglevel(matches)? {
if cli_loglevel > cfg_loglevel { if cli_loglevel > cfg_loglevel {
@ -334,11 +329,8 @@ fn aggregate_global_destinations(matches: &ArgMatches, config: Option<&Value>)
macro_rules! aggregate_global_format { macro_rules! aggregate_global_format {
($read_str:expr, $error_kind_if_missing:expr, $config:expr) => { ($read_str:expr, $error_kind_if_missing:expr, $config:expr) => {
try!($config.ok_or(RE::from_kind($error_kind_if_missing))) try!($config.ok_or(RE::from_kind($error_kind_if_missing)))
.read($read_str)? .read_string($read_str)?
.ok_or_else(|| RE::from_kind($error_kind_if_missing))? .ok_or_else(|| RE::from_kind($error_kind_if_missing))
.as_str()
.map(String::from)
.ok_or_else(|| RE::from_kind(EK::ConfigTypeError($read_str.to_owned(), "String")))
}; };
} }
@ -418,16 +410,7 @@ fn aggregate_module_settings(_matches: &ArgMatches, config: Option<&Value>)
}; };
let level = inner_try! { let level = inner_try! {
v.read("level")? v.read_string("level")?.map(|s| match_log_level_str(&s))
.map(|val| {
val.as_str()
.ok_or_else(|| {
let path = "imag.logging.modules.<mod>.level".to_owned();
let ty = "String";
RE::from_kind(EK::ConfigTypeError(path, ty))
})
.and_then(match_log_level_str)
})
}; };
let enabled = v.read("enabled")? let enabled = v.read("enabled")?