Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config_parsing = [
"typemap-ors",
"log/serde",
]
yaml_format = ["serde_yaml"]
yaml_format = ["serde-saphyr"]
json_format = ["serde_json"]
toml_format = ["toml"]
console_appender = ["console_writer", "simple_writer", "pattern_encoder"]
Expand Down Expand Up @@ -87,7 +87,7 @@ serde = { version = "1.0.196", optional = true, features = ["derive"] }
serde-value = { version = "0.7", optional = true }
typemap-ors = { version = "1.0.0", optional = true }
serde_json = { version = "1.0", optional = true }
serde_yaml = { version = "0.9", optional = true }
serde-saphyr = { version = "0.0.7", optional = true }
toml = { version = "<0.8.10", optional = true }
parking_lot = { version = "0.12.0", optional = true }
rand = { version = "0.9", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/compile_time_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use log::{error, info, trace};

fn main() {
let config_str = include_str!("sample_config.yml");
let config = serde_yaml::from_str(config_str).unwrap();
let config = serde_saphyr::from_str(config_str).unwrap();
log4rs::init_raw_config(config).unwrap();

info!("Goes to console, file and rolling file");
Expand Down
2 changes: 1 addition & 1 deletion src/append/rolling_file/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ appenders:
dir.path().display()
);

let config = ::serde_yaml::from_str::<RawConfig>(&config).unwrap();
let config = ::serde_saphyr::from_str::<RawConfig>(&config).unwrap();
let errors = config.appenders_lossy(&Deserializers::new()).1;
println!("{:?}", errors);
assert!(errors.is_empty());
Expand Down
4 changes: 2 additions & 2 deletions src/append/rolling_file/policy/compound/trigger/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ mod test {
];

for interval in test_error.iter() {
let error = ::serde_yaml::from_str::<TimeTriggerInterval>(interval);
let error = ::serde_saphyr::from_str::<TimeTriggerInterval>(interval);
assert!(error.is_err());
}

Expand Down Expand Up @@ -484,7 +484,7 @@ mod test {
];
for (interval, expected) in test_ok.iter() {
let interval = interval.to_string();
let interval = ::serde_yaml::from_str::<TimeTriggerInterval>(&interval).unwrap();
let interval = ::serde_saphyr::from_str::<TimeTriggerInterval>(&interval).unwrap();
assert_eq!(interval, *expected);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl Format {
fn parse(&self, source: &str) -> anyhow::Result<RawConfig> {
match *self {
#[cfg(feature = "yaml_format")]
Format::Yaml => ::serde_yaml::from_str(source).map_err(Into::into),
Format::Yaml => ::serde_saphyr::from_str(source).map_err(Into::into),
#[cfg(feature = "json_format")]
Format::Json => ::serde_json::from_str(source).map_err(Into::into),
#[cfg(feature = "toml_format")]
Expand Down
6 changes: 3 additions & 3 deletions src/config/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ loggers:
- baz
additive: false
"#;
let config = ::serde_yaml::from_str::<RawConfig>(cfg).unwrap();
let config = ::serde_saphyr::from_str::<RawConfig>(cfg).unwrap();
let errors = config.appenders_lossy(&Deserializers::new()).1;
println!("{:?}", errors);
assert!(errors.is_empty());
Expand All @@ -521,7 +521,7 @@ loggers:
#[test]
#[cfg(feature = "yaml_format")]
fn empty() {
::serde_yaml::from_str::<RawConfig>("{}").unwrap();
::serde_saphyr::from_str::<RawConfig>("{}").unwrap();
}

#[cfg(windows)]
Expand All @@ -545,7 +545,7 @@ loggers:
let config_end = sample_file.find(&config_end_string).unwrap();
let config_str = sample_file[config_start..config_end].trim();

let config = ::serde_yaml::from_str::<RawConfig>(config_str);
let config = ::serde_saphyr::from_str::<RawConfig>(config_str);
assert!(config.is_ok());
assert!(config::create_raw_config(config.unwrap()).is_ok());
}
Expand Down