leyoda/pop-launcher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fmt

Browse source
This commit is contained in:
wiiznokes 2024-07-13 12:47:46 +02:00 • committed by Ashley Wulber
parent d2cd4f2251
commit 8d5cfd7ade
4 changed files with 42 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

27
bin/src/main.rs
View file

@ -5,6 +5,7 @@ use pop_launcher_toolkit::plugins;
use pop_launcher_toolkit::service;
use mimalloc::MiMalloc;
use tracing::info;
#[global_allocator]
static GLOBAL: MiMalloc = MiMalloc;
@ -17,6 +18,8 @@ async fn main() {
init_logging(cmd);
info!("starting {}", cmd);
match cmd {
"calc" => plugins::calc::main().await,
"desktop-entries" => plugins::desktop_entries::main().await,
@ -38,7 +41,8 @@ async fn main() {
}
fn init_logging(cmd: &str) {
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
use tracing_subscriber::prelude::*;
use tracing_subscriber::{fmt, EnvFilter};
let logdir = match dirs::state_dir() {
Some(dir) => dir.join("pop-launcher/"),
@ -61,24 +65,25 @@ fn init_logging(cmd: &str) {
}
}
let fmt_layer = tracing_subscriber::fmt::layer()
.with_target(false)
.with_timer(fmt::time::ChronoLocal::new("%T".into()))
.with_writer(file);
let filter_layer = EnvFilter::try_from_default_env()
.or_else(|_| EnvFilter::try_new("warn"))
.unwrap();
let fmt_layer = fmt::layer().with_target(false).with_writer(file);
let registry = tracing_subscriber::registry()
.with(fmt_layer)
.with(filter_layer);
// would be nice to implement this tracing issue
// for journald https://github.com/tokio-rs/tracing/issues/2348
if let Ok(journal_layer) = tracing_journald::layer() {
tracing_subscriber::registry()
.with(journal_layer)
.with(filter_layer)
.init();
if let Ok(journald_layer) = tracing_journald::layer() {
registry.with(journald_layer).init();
} else {
tracing_subscriber::registry()
.with(fmt_layer)
.with(filter_layer)
.init();
registry.init();
}
}
}