From ce543b7d692d7d822cc326cbcaaca6028b77c86f Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Mon, 13 Sep 2021 17:19:44 -0600 Subject: [PATCH] fixes error log reporting (#469) --- appmgr/src/bin/embassyd.rs | 1 - appmgr/src/context/rpc.rs | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/appmgr/src/bin/embassyd.rs b/appmgr/src/bin/embassyd.rs index 7de49b6c0..b18609dd4 100644 --- a/appmgr/src/bin/embassyd.rs +++ b/appmgr/src/bin/embassyd.rs @@ -243,7 +243,6 @@ fn main() { 3 => log::LevelFilter::Debug, _ => log::LevelFilter::Trace, }; - simple_logging::log_to_stderr(filter); let cfg_path = matches.value_of("config"); let res = { diff --git a/appmgr/src/context/rpc.rs b/appmgr/src/context/rpc.rs index e55e9dbaf..883f082e4 100644 --- a/appmgr/src/context/rpc.rs +++ b/appmgr/src/context/rpc.rs @@ -131,6 +131,9 @@ impl RpcContext { log_level: LevelFilter, ) -> Result { 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); let (shutdown, _) = tokio::sync::broadcast::channel(1); let secret_store = base.secret_store().await?; let db = base.db(&secret_store).await?; @@ -139,13 +142,7 @@ impl RpcContext { .share_stats() .get(&mut db.handle(), true) .await?; - let log_epoch = Arc::new(AtomicU64::new(rand::random())); - let logger = EmbassyLogger::new( - log_level, - log_epoch.clone(), - base.log_server.clone(), - *share, - ); + logger.set_sharing(*share); let docker = Docker::connect_with_unix_defaults()?; let net_controller = NetController::init( ([127, 0, 0, 1], 80).into(),