Merge pull request #2415 from hermit-os/dynamic-log-env

feat(env): make `NO_COLOR` and `HERMIT_LOG_LEVEL_FILTER` respect the runtime environment

Author: mkroening

src/arch/aarch64/kernel/mod.rs

@@ -81,7 +81,6 @@ pub fn boot_processor_init() {
 	crate::mm::init();
 	crate::mm::print_information();
 	CoreLocal::get().add_irq_counter();
-	env::init();
 	interrupts::init();
 	processor::detect_frequency();
 	crate::logging::KERNEL_LOGGER.set_time(true);

src/arch/riscv64/kernel/mod.rs

@@ -99,7 +99,6 @@ pub fn boot_processor_init() {
 	devicetree::init();
 	crate::mm::init();
 	crate::mm::print_information();
-	env::init();
 	interrupts::install();
 
 	finish_processor_init();

src/arch/x86_64/kernel/mod.rs

@@ -95,7 +95,6 @@ pub fn boot_processor_init() {
 	crate::mm::init();
 	crate::mm::print_information();
 	CoreLocal::get().add_irq_counter();
-	env::init();
 	gdt::add_current_core();
 	interrupts::load_idt();
 	pic::init();

src/lib.rs

@@ -234,6 +234,7 @@ fn boot_processor_main() -> ! {
 	// Initialize the kernel and hardware.
 	mm::claim_initial_heap();
 	hermit_sync::Lazy::force(&console::CONSOLE);
+	env::init();
 	unsafe {
 		logging::init();
 	}

src/logging.rs

@@ -101,13 +101,13 @@ impl fmt::Display for ColorLevel {
 }
 
 fn no_color() -> bool {
-	option_env!("NO_COLOR").is_some_and(|val| !val.is_empty())
+	hermit_var!("NO_COLOR").is_some_and(|val| !val.is_empty())
 }
 
 pub unsafe fn init() {
 	log::set_logger(&KERNEL_LOGGER).expect("Can't initialize logger");
 	// Determines LevelFilter at compile time
-	let log_level: Option<&'static str> = option_env!("HERMIT_LOG_LEVEL_FILTER");
+	let log_level = hermit_var!("HERMIT_LOG_LEVEL_FILTER");
 	let mut max_level = LevelFilter::Info;
 
 	if let Some(log_level) = log_level {