FEAT: Brought the library up to date

Cargo.toml

@@ -16,15 +16,16 @@ travis-ci = { repository = "im-0/log4rs-syslog", branch = "master" }
 
 [features]
 default = ["file"]
-file = ["log4rs/file", "log/serde", "serde", "serde_derive"]
+file = ["log/serde", "serde", "serde_derive"]
 unstable = []
 
 [dependencies]
+anyhow = "*"
 bitflags = { version = "*", default_features = false }
 lazy_static = { version = "*", default_features = false }
 libc = { version = "*", default_features = false }
 log = { version = "*", default_features = false }
-log4rs = { version = "*", default_features = false, features = ["pattern_encoder"] }
+log4rs = { version = "*"}
 serde = { version = "*", default_features = false, optional = true }
 serde_derive = { version = "*", default_features = false, optional = true }
 

README.md

@@ -69,12 +69,9 @@ extern crate log4rs;
 extern crate log4rs_syslog;
 
 fn main() {
-    let mut deserializers = log4rs::file::Deserializers::new();
-    log4rs_syslog::register(&mut deserializers);
-
     // Note that configuration file should have right extension, otherwise log4rs will fail to
     // recognize format.
-    log4rs::init_file("test.yaml", deserializers).unwrap();
+    log4rs::init_file("test.yaml", Default::default()).unwrap();
 
     trace!("Example trace message");
     debug!("Example debug message");

examples/from_conf.rs

@@ -7,9 +7,6 @@ extern crate tempfile;
 fn main() {
     use std::io::Write;
 
-    let mut deserializers = log4rs::file::Deserializers::new();
-    log4rs_syslog::register(&mut deserializers);
-
     let yaml_conf = br#"
 appenders:
   syslog:
@@ -41,7 +38,7 @@ root:
     tmp_conf.write_all(yaml_conf).unwrap();
     tmp_conf.flush().unwrap();
 
-    log4rs::init_file(tmp_conf.path(), deserializers).unwrap();
+    log4rs::init_file(tmp_conf.path(), Default::default()).unwrap();
 
     trace!("Example trace message");
     debug!("Example debug message");

src/lib.rs

@@ -37,13 +37,6 @@ extern crate serde_derive;
 #[cfg(feature = "unstable")]
 extern crate test; // For benchmark.
 
-#[cfg(target_family = "unix")]
-#[cfg(feature = "file")]
-mod file;
-#[cfg(target_family = "unix")]
-#[cfg(feature = "file")]
-pub use file::*;
-
 #[cfg(target_family = "unix")]
 mod syslog;
 #[cfg(target_family = "unix")]

src/syslog.rs

@@ -47,11 +47,11 @@ impl std::io::Write for BufWriter {
 impl log4rs::encode::Write for BufWriter {}
 
 /// Function for mapping rust's `log` levels to `libc`'s log levels.
-pub type LevelMap = Fn(log::Level) -> libc::c_int + Send + Sync;
+pub type LevelMap = dyn Fn(log::Level) -> libc::c_int + Send + Sync;
 
 /// An appender which writes log events into syslog using `libc`'s syslog() function.
 pub struct SyslogAppender {
-    encoder: Box<log4rs::encode::Encode>,
+    encoder: Box<dyn log4rs::encode::Encode>,
     level_map: Option<Box<LevelMap>>,
 }
 
@@ -81,7 +81,7 @@ impl SyslogAppender {
 }
 
 impl log4rs::append::Append for SyslogAppender {
-    fn append(&self, record: &log::Record) -> std::result::Result<(), Box<std::error::Error + Sync + Send>> {
+    fn append(&self, record: &log::Record) -> anyhow::Result<()> {
         let mut buf = BufWriter::new();
 
         self.encoder.encode(&mut buf, record)?;
@@ -315,14 +315,14 @@ lazy_static! {
 
 /// Builder for `SyslogAppender`.
 pub struct SyslogAppenderBuilder {
-    encoder: Option<Box<log4rs::encode::Encode>>,
+    encoder: Option<Box<dyn log4rs::encode::Encode>>,
     openlog_args: Option<OpenLogArgs>,
     level_map: Option<Box<LevelMap>>,
 }
 
 impl SyslogAppenderBuilder {
     /// Set custom encoder.
-    pub fn encoder(mut self, encoder: Box<log4rs::encode::Encode>) -> Self {
+    pub fn encoder(mut self, encoder: Box<dyn log4rs::encode::Encode>) -> Self {
         self.encoder = Some(encoder);
         self
     }