From 00f9f49e128f867f1ba4b436ddaaffd534d71941 Mon Sep 17 00:00:00 2001 From: Geoffrey Allott Date: Sat, 6 Mar 2021 22:32:52 +0000 Subject: [PATCH] set log level from config --- src/config.rs | 2 +- src/main.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/config.rs b/src/config.rs index 86604fe..bef5394 100644 --- a/src/config.rs +++ b/src/config.rs @@ -11,7 +11,7 @@ pub struct Config { } fn default_filter() -> String { - "warn".to_string() + "info".to_string() } fn default_style() -> String { diff --git a/src/main.rs b/src/main.rs index 6ddfbc2..57b62ae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,7 +54,6 @@ async fn serve_404(response: Response) -> Result { #[async_std::main] async fn main() -> Result<(), tide::Error> { - env_logger::init(); let matches = app_from_crate!() .arg( Arg::with_name("config") @@ -78,11 +77,16 @@ async fn main() -> Result<(), tide::Error> { ) .subcommand(SubCommand::with_name("all").about("Serve the website, websocket connections and start a dealer for each game (default)")) .get_matches(); + let config = match matches.value_of_os("config") { Some(path) => toml::from_str(&read_to_string(path)?)?, None => Config::default(), }; + env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(config.log.filter).default_write_style_or(config.log.style)) + .format_timestamp_millis() + .init(); + let mut run_server = true; let mut run_dealer = true; let mut partition = Partition::default(); -- 2.34.1