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

fixes error log reporting (#469)

Browse Source
This commit is contained in:
Keagan McClelland
2021-09-13 17:19:44 -06:00
committed by Aiden McClelland
parent a4ef11a60f
commit ce543b7d69
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appmgr/src/bin/embassyd.rs
View File

@@ -243,7 +243,6 @@ fn main() {
3 => log::LevelFilter::Debug, 3 => log::LevelFilter::Debug,
_ => log::LevelFilter::Trace, _ => log::LevelFilter::Trace,
}; };
simple_logging::log_to_stderr(filter);
let cfg_path = matches.value_of("config"); let cfg_path = matches.value_of("config");
let res = { let res = {

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

@@ -131,6 +131,9 @@ impl RpcContext {
log_level: LevelFilter, log_level: LevelFilter,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let base = RpcContextConfig::load(cfg_path).await?; 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 (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?;
@@ -139,13 +142,7 @@ impl RpcContext {
.share_stats() .share_stats()
.get(&mut db.handle(), true) .get(&mut db.handle(), true)
.await?; .await?;
let log_epoch = Arc::new(AtomicU64::new(rand::random())); logger.set_sharing(*share);
let logger = EmbassyLogger::new(
log_level,
log_epoch.clone(),
base.log_server.clone(),
*share,
);
let docker = Docker::connect_with_unix_defaults()?; let docker = Docker::connect_with_unix_defaults()?;
let net_controller = NetController::init( let net_controller = NetController::init(
([127, 0, 0, 1], 80).into(), ([127, 0, 0, 1], 80).into(),