diff --git a/config/redbear-full.toml b/config/redbear-full.toml index 284410a7..3a1e429b 100644 --- a/config/redbear-full.toml +++ b/config/redbear-full.toml @@ -229,6 +229,10 @@ args = ["-l", "info"] type = "oneshot_async" """ +[[files]] +path = "/etc/keymaps/.gitkeep" +data = "" + [[files]] path = "/etc/init.d/13_redbear-keymapd.service" data = """ diff --git a/local/recipes/system/cpufreqd/source/src/main.rs b/local/recipes/system/cpufreqd/source/src/main.rs index a4c11592..f664ff2c 100644 --- a/local/recipes/system/cpufreqd/source/src/main.rs +++ b/local/recipes/system/cpufreqd/source/src/main.rs @@ -8,7 +8,7 @@ const IA32_PERF_CTL: u32 = 0x199; const POLL_MS: u64 = 100; const SAMPLE_WINDOW: usize = 10; const STATE_WRITE_INTERVAL_S: u64 = 1; -const MSR_ERROR_SUPPRESS_COUNT: u32 = 10; +const MSR_ERROR_SUPPRESS_COUNT: u32 = 1; const THERMAL_CACHE_MS: u64 = 1000; #[derive(Clone, Copy, PartialEq, Debug)] diff --git a/local/recipes/system/redbear-accessibility/source/src/main.rs b/local/recipes/system/redbear-accessibility/source/src/main.rs index b6c490ce..e58bd5c3 100644 --- a/local/recipes/system/redbear-accessibility/source/src/main.rs +++ b/local/recipes/system/redbear-accessibility/source/src/main.rs @@ -1,6 +1,8 @@ mod scheme; use std::io::Write; +use std::thread; +use std::time::Duration; use scheme::AccessibilityScheme; @@ -23,8 +25,9 @@ fn main() { break; } Err(e) => { - log_msg("ERROR", &format!("failed to read request: {}", e)); - break; + log_msg("WARN", &format!("scheme read error (ignoring): {}", e)); + thread::sleep(Duration::from_millis(100)); + continue; } }; diff --git a/local/recipes/system/redbear-ime/source/src/main.rs b/local/recipes/system/redbear-ime/source/src/main.rs index b9ceef54..87f51804 100644 --- a/local/recipes/system/redbear-ime/source/src/main.rs +++ b/local/recipes/system/redbear-ime/source/src/main.rs @@ -1,6 +1,8 @@ mod scheme; use std::io::Write; +use std::thread; +use std::time::Duration; use scheme::ImeScheme; @@ -23,8 +25,9 @@ fn main() { break; } Err(e) => { - log_msg("ERROR", &format!("failed to read request: {}", e)); - break; + log_msg("WARN", &format!("scheme read error (ignoring): {}", e)); + thread::sleep(Duration::from_millis(100)); + continue; } }; diff --git a/local/recipes/system/redbear-keymapd/source/src/main.rs b/local/recipes/system/redbear-keymapd/source/src/main.rs index b7eb3aba..4b1efd8c 100644 --- a/local/recipes/system/redbear-keymapd/source/src/main.rs +++ b/local/recipes/system/redbear-keymapd/source/src/main.rs @@ -4,7 +4,8 @@ mod xkb; use std::env; use std::io::Write; -use std::process; +use std::thread; +use std::time::Duration; use scheme::KeymapScheme; @@ -40,8 +41,9 @@ fn main() { break; } Err(e) => { - log_msg("ERROR", &format!("failed to read request: {}", e)); - break; + log_msg("WARN", &format!("scheme read error (ignoring): {}", e)); + thread::sleep(Duration::from_millis(100)); + continue; } }; diff --git a/local/recipes/system/udev-shim/source/src/scheme.rs b/local/recipes/system/udev-shim/source/src/scheme.rs index 945f6b58..a12089c6 100644 --- a/local/recipes/system/udev-shim/source/src/scheme.rs +++ b/local/recipes/system/udev-shim/source/src/scheme.rs @@ -100,7 +100,7 @@ impl UdevScheme { } } Err(err) => { - log::warn!("udev-shim: failed to read /scheme/pci: {err}"); + log::debug!("udev-shim: failed to read /scheme/pci: {err}"); } }