Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes logging

Browse Source
This commit is contained in:
Keagan McClelland
2021-09-16 14:39:16 -06:00
committed by Aiden McClelland
parent 506799828c
commit a7363ae4e1
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appmgr/src/bin/embassy-init.rs
View File

@@ -8,6 +8,7 @@ use embassy::hostname::get_product_key;
use embassy::middleware::cors::cors; use embassy::middleware::cors::cors;
use embassy::middleware::diagnostic::diagnostic; use embassy::middleware::diagnostic::diagnostic;
use embassy::middleware::encrypt::encrypt; use embassy::middleware::encrypt::encrypt;
#[cfg(feature = "avahi")]
use embassy::net::mdns::MdnsController; use embassy::net::mdns::MdnsController;
use embassy::sound::MARIO_COIN; use embassy::sound::MARIO_COIN;
use embassy::util::Invoke; use embassy::util::Invoke;

2
appmgr/src/context/rpc.rs
View File

@@ -134,7 +134,7 @@ impl RpcContext {
let base = RpcContextConfig::load(cfg_path).await?; let base = RpcContextConfig::load(cfg_path).await?;
let log_epoch = Arc::new(AtomicU64::new(rand::random())); let log_epoch = Arc::new(AtomicU64::new(rand::random()));
let logger = 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 (shutdown, _) = tokio::sync::broadcast::channel(1);
let secret_store = base.secret_store().await?; let secret_store = base.secret_store().await?;
let db = base.db(&secret_store).await?; let db = base.db(&secret_store).await?;

18
appmgr/src/util/logger.rs
View File

@@ -2,7 +2,7 @@ use std::collections::HashMap;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::Arc; 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 reqwest::{Client, Url};
use stderrlog::{StdErrLog, Timestamp}; use stderrlog::{StdErrLog, Timestamp};
@@ -15,7 +15,7 @@ pub struct EmbassyLogger {
share_dest: Url, share_dest: Url,
} }
impl EmbassyLogger { impl EmbassyLogger {
pub fn new( pub fn init(
log_level: log::LevelFilter, log_level: log::LevelFilter,
log_epoch: Arc<AtomicU64>, log_epoch: Arc<AtomicU64>,
share_dest: Option<Url>, share_dest: Option<Url>,
@@ -26,9 +26,7 @@ impl EmbassyLogger {
Some(a) => a, Some(a) => a,
}; };
let mut logger = stderrlog::new(); let mut logger = stderrlog::new();
logger logger.timestamp(Timestamp::Millisecond);
.module(module_path!())
.timestamp(Timestamp::Millisecond);
match log_level { match log_level {
LevelFilter::Off => logger.quiet(true), LevelFilter::Off => logger.quiet(true),
LevelFilter::Error => logger.verbosity(0), LevelFilter::Error => logger.verbosity(0),
@@ -45,6 +43,7 @@ impl EmbassyLogger {
share_dest: share_dest, share_dest: share_dest,
}; };
set_boxed_logger(Box::new(embassy_logger.clone())).unwrap(); set_boxed_logger(Box::new(embassy_logger.clone())).unwrap();
set_max_level(log_level);
embassy_logger embassy_logger
} }
pub fn set_sharing(&self, sharing: bool) { 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] #[tokio::test]
pub async fn order_level() { pub async fn order_level() {
assert!(log::Level::Warn > log::Level::Error) assert!(log::Level::Warn > log::Level::Error)
} }
#[test]
pub fn module() {
println!("{}", module_path!())
}