From 0773347daf9dd5b1433884aeabd007f2f605adeb Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 1 Feb 2020 07:11:14 -0500 Subject: logging setup --- src/lib.rs | 7 +------ src/main.rs | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 60d89cd..5d3ff06 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,12 +9,7 @@ extern crate rocket_contrib; #[macro_use] extern crate diesel; -#[derive(Debug)] -pub struct Config { - pub client_id: String, - pub client_secret: String, - pub base_url: String, -} +extern crate fern; pub mod db; pub mod error; diff --git a/src/main.rs b/src/main.rs index d8d1283..6e11fc4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +extern crate fern; +#[macro_use] +extern crate log; extern crate clap; use clap::App; use clap::Arg; @@ -5,6 +8,21 @@ use clap::SubCommand; use diesel::connection::Connection; use diesel::pg::PgConnection; +fn setup_logger() -> Result<(), fern::InitError> { + use fern::colors::ColoredLevelConfig; + let colors = ColoredLevelConfig::new(); + fern::Dispatch::new() + .format(move |out, message, record| { + out.finish(format_args!("[{}] {}", + colors.color(record.level()), + message)) + }) + .level(log::LevelFilter::Info) + .chain(std::io::stdout()) + .apply()?; + Ok(()) +} + fn main() { let matches = App::new("pjournal") .version("0.1") @@ -56,6 +74,8 @@ fn main() { ) .get_matches(); + setup_logger().expect("logger"); + let base_url = matches .value_of("base_url") .unwrap_or("http://localhost:8000"); @@ -80,6 +100,7 @@ fn main() { let password = matches.value_of("PASSWORD").unwrap(); pjournal::db::adduser(&conn, user, password).unwrap(); } else { + info!("Start server"); pjournal::server::start(conn, db_url, base_url); } } -- cgit v1.2.3