starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-25 10:08:33 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

feat(wm): add flag to set logging verbosity

Browse Source 
This commit adds a --log-level flag to komorebi.exe which allows the
user to set the logging verbosity without setting the RUST_LOG
environment variable directly. If the RUST_LOG environment variable is
set, it will take precedence over the --log-level flag.
This commit is contained in:
LGUG2Z
2025-03-28 19:03:05 -07:00
parent a98968d179
commit acd53dec1b
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
komorebi/src/main.rs
View File

@@ -16,6 +16,7 @@ use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use clap::Parser; use clap::Parser;
use clap::ValueEnum;
use color_eyre::Result; use color_eyre::Result;
use crossbeam_utils::Backoff; use crossbeam_utils::Backoff;
use komorebi::animation::AnimationEngine; use komorebi::animation::AnimationEngine;
@@ -24,6 +25,7 @@ use komorebi::animation::ANIMATION_ENABLED_PER_ANIMATION;
#[cfg(feature = "deadlock_detection")] #[cfg(feature = "deadlock_detection")]
use parking_lot::deadlock; use parking_lot::deadlock;
use parking_lot::Mutex; use parking_lot::Mutex;
use serde::Deserialize;
use sysinfo::Process; use sysinfo::Process;
use sysinfo::ProcessesToUpdate; use sysinfo::ProcessesToUpdate;
use tracing_appender::non_blocking::WorkerGuard; use tracing_appender::non_blocking::WorkerGuard;
@@ -57,7 +59,7 @@ use komorebi::SESSION_ID;
shadow_rs::shadow!(build); shadow_rs::shadow!(build);
fn setup() -> Result<(WorkerGuard, WorkerGuard)> { fn setup(log_level: LogLevel) -> Result<(WorkerGuard, WorkerGuard)> {
if std::env::var("RUST_LIB_BACKTRACE").is_err() { if std::env::var("RUST_LIB_BACKTRACE").is_err() {
std::env::set_var("RUST_LIB_BACKTRACE", "1"); std::env::set_var("RUST_LIB_BACKTRACE", "1");
} }
@@ -65,7 +67,16 @@ fn setup() -> Result<(WorkerGuard, WorkerGuard)> {
color_eyre::install()?; color_eyre::install()?;
if std::env::var("RUST_LOG").is_err() { if std::env::var("RUST_LOG").is_err() {
std::env::set_var("RUST_LOG", "info"); std::env::set_var(
"RUST_LOG",
match log_level {
LogLevel::Error => "error",
LogLevel::Warn => "warn",
LogLevel::Info => "info",
LogLevel::Debug => "debug",
LogLevel::Trace => "trace",
},
);
} }
let appender = tracing_appender::rolling::daily(std::env::temp_dir(), "komorebi_plaintext.log"); let appender = tracing_appender::rolling::daily(std::env::temp_dir(), "komorebi_plaintext.log");
@@ -143,6 +154,17 @@ fn detect_deadlocks() {
}); });
} }
#[derive(Default, Deserialize, ValueEnum, Clone)]
#[serde(rename_all = "snake_case")]
enum LogLevel {
Error,
Warn,
#[default]
Info,
Debug,
Trace,
}
#[derive(Parser)] #[derive(Parser)]
#[clap(author, about, version = build::CLAP_LONG_VERSION)] #[clap(author, about, version = build::CLAP_LONG_VERSION)]
struct Opts { struct Opts {
@@ -161,6 +183,9 @@ struct Opts {
/// Do not attempt to auto-apply a dumped state temp file from a previously running instance of komorebi /// Do not attempt to auto-apply a dumped state temp file from a previously running instance of komorebi
#[clap(long)] #[clap(long)]
clean_state: bool, clean_state: bool,
/// Level of log output verbosity
#[clap(long, value_enum, default_value_t=LogLevel::Info)]
log_level: LogLevel,
} }
#[tracing::instrument] #[tracing::instrument]
@@ -198,7 +223,7 @@ fn main() -> Result<()> {
} }
// File logging worker guard has to have an assignment in the main fn to work // File logging worker guard has to have an assignment in the main fn to work
let (_guard, _color_guard) = setup()?; let (_guard, _color_guard) = setup(opts.log_level)?;
WindowsApi::foreground_lock_timeout()?; WindowsApi::foreground_lock_timeout()?;