From 09439de0a6fbfe8dd5032f48045f89067ed66c68 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 11 May 2022 11:19:59 +0200 Subject: Make logging non-optional Before this patch, the logging code was optional in tedge-cli. But we always want to build this piece of code. Signed-off-by: Matthias Beyer --- tedge/Cargo.toml | 4 +--- tedge/src/logging.rs | 34 ++++++++++++++-------------------- 2 files changed, 15 insertions(+), 23 deletions(-) (limited to 'tedge') diff --git a/tedge/Cargo.toml b/tedge/Cargo.toml index 3f52dfa7..3e2e6906 100644 --- a/tedge/Cargo.toml +++ b/tedge/Cargo.toml @@ -12,7 +12,7 @@ tokio = { version = "1", features = ["fs", "macros", "rt-multi-thread", "signal" miette = { version = "4.4", features = ["fancy"] } cfg-if = "1" tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true } +tracing-subscriber = { version = "0.3", features = ["env-filter"] } cfg_table = "1.0.0" tedge_api = { path = "../crates/core/tedge_api" } @@ -34,7 +34,6 @@ plugin_notification = { path = "../plugins/plugin_notification", optional = true [features] default = [ - "core_logging", "builtin_plugin_avg", "builtin_plugin_log", "builtin_plugin_sysstat", @@ -44,7 +43,6 @@ default = [ "builtin_plugin_notification", ] -core_logging = ["tracing-subscriber"] builtin_plugin_avg = ["plugin_avg"] builtin_plugin_log = ["plugin_log"] builtin_plugin_sysstat = ["plugin_sysstat"] diff --git a/tedge/src/logging.rs b/tedge/src/logging.rs index 0ea6cbe1..e1c8bd99 100644 --- a/tedge/src/logging.rs +++ b/tedge/src/logging.rs @@ -1,25 +1,19 @@ -#[allow(unused)] pub(crate) fn setup_logging(verbose: bool, debugging: bool) -> miette::Result<()> { - #[cfg(feature = "core_logging")] - { - use tracing_subscriber::filter::EnvFilter; - use tracing_subscriber::filter::LevelFilter; + use tracing_subscriber::filter::EnvFilter; + use tracing_subscriber::filter::LevelFilter; - let filter = if verbose && !debugging { - EnvFilter::from_default_env().add_directive(LevelFilter::INFO.into()) - } else if debugging { - EnvFilter::from_default_env().add_directive(LevelFilter::DEBUG.into()) - } else { - EnvFilter::from_default_env() - }; + let filter = if verbose && !debugging { + EnvFilter::from_default_env().add_directive(LevelFilter::INFO.into()) + } else if debugging { + EnvFilter::from_default_env().add_directive(LevelFilter::DEBUG.into()) + } else { + EnvFilter::from_default_env() + }; - let subscriber = tracing_subscriber::fmt::Subscriber::builder() - .with_env_filter(filter) - .finish(); + let subscriber = tracing_subscriber::fmt::Subscriber::builder() + .with_env_filter(filter) + .finish(); - tracing::subscriber::set_global_default(subscriber) - .map_err(|e| miette::miette!("Failed to set global subscriber: {:?}", e))?; - } - - Ok(()) + tracing::subscriber::set_global_default(subscriber) + .map_err(|e| miette::miette!("Failed to set global subscriber: {:?}", e)) } -- cgit v1.2.3