diff --git a/Cargo.toml b/Cargo.toml index a9f80375..16e262a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,9 +21,6 @@ chrono = "0.3" clap = "2.19.3" error-chain = "0.8.1" nickel = "0.9.0" -slog = "1.4.0" -slog-scope = "0.2.2" -slog-term = "1.3.4" time = "0.1.35" [dependencies.rusqlite] diff --git a/src/lib.rs b/src/lib.rs index c9686a86..76762777 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,12 +11,6 @@ #[macro_use] extern crate error_chain; -#[macro_use] -extern crate slog; - -#[macro_use] -extern crate slog_scope; - extern crate rusqlite; extern crate edn; @@ -38,7 +32,6 @@ pub mod conn; pub mod query; pub fn get_name() -> String { - info!("Called into mentat library"; "fn" => "get_name"); return String::from("mentat"); } diff --git a/src/main.rs b/src/main.rs index a0fc6447..ca1e2e02 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,16 +13,9 @@ extern crate clap; use nickel::{Nickel, HttpRouter}; -#[macro_use] -extern crate slog; -#[macro_use] -extern crate slog_scope; -extern crate slog_term; - extern crate mentat; use clap::{App, Arg, SubCommand, AppSettings}; -use slog::DrainExt; use std::u16; use std::str::FromStr; @@ -59,23 +52,6 @@ fn main() { matches.value_of("port").unwrap()); } - // Set up logging. - let log_level = if debug { - slog::Level::Debug - } else { - slog::Level::Warning - }; - let term_logger = slog_term::streamer().build().fuse(); - let log = slog::Logger::root(slog::LevelFilter::new(term_logger, log_level), - o!("version" => env!("CARGO_PKG_VERSION"))); - slog_scope::set_global_logger(log); - - info!("Serving database"; "database" => matches.value_of("database").unwrap(), - "port" => port, - "debug mode" => debug); - - error!("Calling a function: {}", mentat::get_name()); - let mut server = Nickel::new(); server.get("/", middleware!("This doesn't do anything yet")); server.listen(("127.0.0.1", port)).expect("Failed to launch server");