github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-07 12:05:49 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Remove verbosity out of watchers config

Browse Source
This commit is contained in:
Demmie 2023-05-07 20:56:54 -04:00
parent 63bfe4181e
commit 53a5c1adce
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/verify.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- uses: dtolnay/rust-toolchain@nightly - uses: dtolnay/rust-toolchain@nightly
with: with:
components: rustfmt components: rustfmt
- run: cargo fmt --check --workspace --all - run: cargo fmt --check --all
clippy: clippy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

33
src/config.rs
View File

@ -6,10 +6,15 @@ use clap::{arg, value_parser, Arg, ArgAction, ArgMatches, Command};
use fern::colors::{Color, ColoredLevelConfig}; use fern::colors::{Color, ColoredLevelConfig};
use log::LevelFilter; use log::LevelFilter;
use watchers::config::defaults; use watchers::config::defaults;
use watchers::config::Config; use watchers::config::Config as WatchersConfig;
use watchers::config::FileConfig; use watchers::config::FileConfig;
pub fn setup_logger(verbosity: LevelFilter) -> Result<(), fern::InitError> { pub struct Config {
pub watchers_config: WatchersConfig,
verbosity: LevelFilter,
}
pub fn setup_logger(config: &Config) -> Result<(), fern::InitError> {
fern::Dispatch::new() fern::Dispatch::new()
.format(|out, message, record| { .format(|out, message, record| {
let colors = ColoredLevelConfig::new() let colors = ColoredLevelConfig::new()
@ -25,8 +30,8 @@ pub fn setup_logger(verbosity: LevelFilter) -> Result<(), fern::InitError> {
)); ));
}) })
.level(log::LevelFilter::Error) .level(log::LevelFilter::Error)
.level_for("watchers", verbosity) .level_for("watchers", config.verbosity)
.level_for("awatcher", verbosity) .level_for("awatcher", config.verbosity)
.chain(std::io::stdout()) .chain(std::io::stdout())
.apply()?; .apply()?;
Ok(()) Ok(())
@ -77,15 +82,17 @@ pub fn from_cli() -> anyhow::Result<Config> {
}; };
Ok(Config { Ok(Config {
port: config.server.port, watchers_config: WatchersConfig {
host: config.server.host, port: config.server.port,
idle_timeout: config.client.get_idle_timeout(), host: config.server.host,
poll_time_idle: config.client.get_poll_time_idle(), idle_timeout: config.client.get_idle_timeout(),
poll_time_window: config.client.get_poll_time_window(), poll_time_idle: config.client.get_poll_time_idle(),
idle_bucket_name, poll_time_window: config.client.get_poll_time_window(),
active_window_bucket_name, idle_bucket_name,
filters: config.client.filters, active_window_bucket_name,
no_server: *matches.get_one("no-server").unwrap(), filters: config.client.filters,
no_server: *matches.get_one("no-server").unwrap(),
},
verbosity, verbosity,
}) })
} }

4
src/main.rs
View File

@ -11,9 +11,9 @@ use watchers::ReportClient;
fn main() -> anyhow::Result<()> { fn main() -> anyhow::Result<()> {
let config = config::from_cli()?; let config = config::from_cli()?;
config::setup_logger(config.verbosity)?; config::setup_logger(&config)?;
let client = ReportClient::new(config)?; let client = ReportClient::new(config.watchers_config)?;
let client = Arc::new(client); let client = Arc::new(client);
if client.config.no_server { if client.config.no_server {

2
watchers/src/config.rs
View File

@ -4,7 +4,6 @@ mod filters;
use self::filters::{Filter, Replacement}; use self::filters::{Filter, Replacement};
pub use file_config::FileConfig; pub use file_config::FileConfig;
use log::LevelFilter;
use std::time::Duration; use std::time::Duration;
pub struct Config { pub struct Config {
@ -16,7 +15,6 @@ pub struct Config {
pub idle_bucket_name: String, pub idle_bucket_name: String,
pub active_window_bucket_name: String, pub active_window_bucket_name: String,
pub no_server: bool, pub no_server: bool,
pub verbosity: LevelFilter,
pub filters: Vec<Filter>, pub filters: Vec<Filter>,
} }