diff --git a/appmgr/src/bin/embassy-init.rs b/appmgr/src/bin/embassy-init.rs index a09019590..80e1c0d22 100644 --- a/appmgr/src/bin/embassy-init.rs +++ b/appmgr/src/bin/embassy-init.rs @@ -8,6 +8,7 @@ use embassy::hostname::get_product_key; use embassy::middleware::cors::cors; use embassy::middleware::diagnostic::diagnostic; use embassy::middleware::encrypt::encrypt; +#[cfg(feature = "avahi")] use embassy::net::mdns::MdnsController; use embassy::sound::MARIO_COIN; use embassy::util::Invoke; diff --git a/appmgr/src/context/rpc.rs b/appmgr/src/context/rpc.rs index 546bc7c88..97256f681 100644 --- a/appmgr/src/context/rpc.rs +++ b/appmgr/src/context/rpc.rs @@ -134,7 +134,7 @@ impl RpcContext { let base = RpcContextConfig::load(cfg_path).await?; let log_epoch = Arc::new(AtomicU64::new(rand::random())); let logger = - EmbassyLogger::new(log_level, log_epoch.clone(), base.log_server.clone(), false); + EmbassyLogger::init(log_level, log_epoch.clone(), base.log_server.clone(), false); let (shutdown, _) = tokio::sync::broadcast::channel(1); let secret_store = base.secret_store().await?; let db = base.db(&secret_store).await?; diff --git a/appmgr/src/util/logger.rs b/appmgr/src/util/logger.rs index 5dd3219c3..58e230568 100644 --- a/appmgr/src/util/logger.rs +++ b/appmgr/src/util/logger.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::sync::Arc; -use log::{set_boxed_logger, LevelFilter, Metadata, Record}; +use log::{set_boxed_logger, set_max_level, LevelFilter, Metadata, Record}; use reqwest::{Client, Url}; use stderrlog::{StdErrLog, Timestamp}; @@ -15,7 +15,7 @@ pub struct EmbassyLogger { share_dest: Url, } impl EmbassyLogger { - pub fn new( + pub fn init( log_level: log::LevelFilter, log_epoch: Arc, share_dest: Option, @@ -26,9 +26,7 @@ impl EmbassyLogger { Some(a) => a, }; let mut logger = stderrlog::new(); - logger - .module(module_path!()) - .timestamp(Timestamp::Millisecond); + logger.timestamp(Timestamp::Millisecond); match log_level { LevelFilter::Off => logger.quiet(true), LevelFilter::Error => logger.verbosity(0), @@ -45,6 +43,7 @@ impl EmbassyLogger { share_dest: share_dest, }; set_boxed_logger(Box::new(embassy_logger.clone())).unwrap(); + set_max_level(log_level); embassy_logger } pub fn set_sharing(&self, sharing: bool) { @@ -76,10 +75,17 @@ impl log::Log for EmbassyLogger { } } } - fn flush(&self) {} + fn flush(&self) { + self.logger.flush() + } } #[tokio::test] pub async fn order_level() { assert!(log::Level::Warn > log::Level::Error) } + +#[test] +pub fn module() { + println!("{}", module_path!()) +}