summaryrefslogtreecommitdiffhomepage
path: root/src/log.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/log.rs')
-rw-r--r--src/log.rs29
1 files changed, 3 insertions, 26 deletions
diff --git a/src/log.rs b/src/log.rs
index d4cd1e7..639a0e0 100644
--- a/src/log.rs
+++ b/src/log.rs
@@ -1,4 +1,4 @@
-// Copyright 2025 Dillution <[email protected]>.
+// Copyright 2025-2026 Dillution <[email protected]>.
//
// This file is part of DPIBreak.
//
@@ -16,7 +16,6 @@
// along with DPIBreak. If not, see <https://www.gnu.org/licenses/>.
use std::fmt;
-use std::sync::OnceLock;
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub enum LogLevel {
@@ -26,18 +25,6 @@ pub enum LogLevel {
Error, // Unrecoverable
}
-const DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Warning;
-
-static LOG_LEVEL_OVERRIDE: OnceLock<LogLevel> = OnceLock::new();
-
-pub fn set_log_level(level: LogLevel) -> Result<(), &'static str> {
- LOG_LEVEL_OVERRIDE.set(level).map_err(|_| "LOG_LEVEL already initialized")
-}
-
-pub fn current_log_level() -> LogLevel {
- *LOG_LEVEL_OVERRIDE.get().unwrap_or(&DEFAULT_LOG_LEVEL)
-}
-
impl fmt::Display for LogLevel {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let p = match self {
@@ -74,20 +61,10 @@ impl std::str::FromStr for LogLevel {
}
}
-static NO_SPLASH: OnceLock<bool> = OnceLock::new();
-
-pub fn set_no_splash(no_splash: bool) -> Result<(), &'static str> {
- NO_SPLASH.set(no_splash).map_err(|_| "NO_SPLASH already initialized")
-}
-
-pub fn no_splash() -> bool {
- *NO_SPLASH.get().unwrap_or(&false)
-}
-
#[macro_export]
macro_rules! log_println {
($level:expr, $($arg:tt)*) => {{
- if $level >= crate::log::current_log_level() {
+ if $level >= crate::opt::log_level() {
println!("{} {}", $level, format_args!($($arg)*));
}
}};
@@ -96,7 +73,7 @@ macro_rules! log_println {
#[macro_export]
macro_rules! splash {
($($arg:tt)*) => {{
- if !crate::log::no_splash() {
+ if !crate::opt::no_splash() {
println!($($arg)*);
}
}};