diff --git a/hammond-cli/src/main.rs b/hammond-cli/src/main.rs index 5a3646b..20c77b6 100644 --- a/hammond-cli/src/main.rs +++ b/hammond-cli/src/main.rs @@ -36,7 +36,7 @@ struct Opt { fn run() -> Result<()> { let args = Opt::from_args(); - loggerv::init_with_verbosity(args.verbosity).unwrap(); + loggerv::init_with_verbosity(args.verbosity)?; hammond_data::init()?; diff --git a/hammond-data/Cargo.toml b/hammond-data/Cargo.toml index c01bd38..246f02b 100644 --- a/hammond-data/Cargo.toml +++ b/hammond-data/Cargo.toml @@ -10,12 +10,12 @@ hyper = "0.11.2" reqwest = "0.7.3" error-chain = "0.11.0" log = "0.3.8" -loggerv = "0.3.0" -diesel = { version = "0.16.0", features = ["sqlite", "deprecated-time", "chrono"] } +diesel = { version = "0.16.0", features = ["sqlite"] } diesel_codegen = { version = "0.16.0", features = ["sqlite"] } xdg = "2.1.0" lazy_static = "0.2.8" -rss = { version = "1.1.0", features = ["from_url"]} +rss = "1.1.0" +# overwrite diesel dependancy that disables a feature rss depends upon dotenv = "*" [dev-dependencies] diff --git a/hammond-data/src/errors.rs b/hammond-data/src/errors.rs index f892d2b..4c3f2ca 100644 --- a/hammond-data/src/errors.rs +++ b/hammond-data/src/errors.rs @@ -3,11 +3,13 @@ use diesel::result; use rss; use hyper; use reqwest; +use log; use std::io; error_chain! { foreign_links { + LogError(log::SetLoggerError); MigrationError(RunMigrationsError); DieselResultError(result::Error); RSSError(rss::Error); diff --git a/hammond-data/src/lib.rs b/hammond-data/src/lib.rs index b7ab700..8a633b4 100644 --- a/hammond-data/src/lib.rs +++ b/hammond-data/src/lib.rs @@ -8,7 +8,6 @@ extern crate lazy_static; #[macro_use] extern crate log; -extern crate loggerv; #[macro_use] extern crate diesel; diff --git a/hammond-downloader/Cargo.toml b/hammond-downloader/Cargo.toml index c63d5d4..0c95f69 100644 --- a/hammond-downloader/Cargo.toml +++ b/hammond-downloader/Cargo.toml @@ -7,10 +7,8 @@ authors = ["Jordan Petridis "] hammond-data = {path = "../hammond-data"} error-chain = "0.11.0" log = "0.3.8" -loggerv = "0.3.0" reqwest = "0.7.3" hyper = "0.11.2" diesel = { version = "0.16.0", features = ["sqlite"] } -diesel_codegen = { version = "0.16.0", features = ["sqlite"] } rss = { version = "1.1.0", features = ["from_url"]} dotenv = "*"