monolith

public

Star0

Fork 0

Watch0

290 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `01e6a6d74d49`

tarball

atagen <boss@atagen.co>2026-10-19 10:50 UTC

5 files changed+36-18

config: report startup warnings and summarise them on reload

Warnings from the first load were only logged, and Settings.warnings stayed empty until an IPC reload. A reload from a bind printed nothing at all unless the journal was open to its individual lines. get warnings now answers from Settings.warnings and every reload ends with one log line carrying the count.

Modified file: crates/ipc/src/lib.rs+1

@@ -249,6 +249,7 @@ pub enum Request {

249249 pub enum Query {

250250 State,

251251 Version,

252+ Warnings,

252253 }

253254

254255 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]

Modified file: crates/monolith/src/commands.rs+18 additions−7 deletions@@ -227,12 +227,11 @@ impl State {
     /// warnings for what had to be left out.
     pub fn reload(&mut self) -> Result<(), String> {
         let loaded = Config::load(self.settings.path.as_deref()).map_err(|e| e.to_string())?;
-        let mut warnings = loaded.warnings.clone();
-        let config = warn_config(loaded);
+        let (config, binds, warnings) = adopt(loaded);
         let keyboard_changed = config.keyboard != self.settings.config.keyboard;
         let input_changed = config.input != self.settings.config.input;
-        self.settings.binds = Binds::new(&config);
-        warnings.extend(self.settings.binds.warnings.iter().cloned());
+        let warned = warnings.len();
+        self.settings.binds = binds;
         self.settings.warnings = warnings;
         self.wm.layout.gaps = crate::state::gaps(&config);
         self.wm.layout.autotile = config.general.autotile;
@@ -247,14 +246,26 @@ impl State {
         crate::drm::reconfigure_outputs(self);
         crate::nested::reconfigure(self);
         self.configure_idle();
-        tracing::info!("config reloaded");
+        if warned == 0 {
+            tracing::info!("config reloaded");
+        } else {
+            tracing::warn!(
+                warned,
+                "config reloaded with warnings, msg reload prints them"
+            );
+        }
         Ok(())
     }
 }
 
-pub fn warn_config(loaded: monolith_config::Loaded) -> Config {
+/// Logs what loading left out and returns the config with the binds made
+/// from it and every warning, which IPC reports.
+pub fn adopt(loaded: monolith_config::Loaded) -> (Config, Binds, Vec<String>) {
     for w in &loaded.warnings {
         tracing::warn!("config: {w}");
     }
-    loaded.config
+    let binds = Binds::new(&loaded.config);
+    let mut warnings = loaded.warnings;
+    warnings.extend(binds.warnings.iter().cloned());
+    (loaded.config, binds, warnings)
 }

Modified file: crates/monolith/src/ipc.rs+3 additions@@ -114,6 +114,9 @@ fn handle_line(state: &mut State, stream: &UnixStream, line: &[u8]) -> Option<En
             Err(e) => Reply::Error(e),
         },
         Request::Get(Query::State) => Reply::Ok(Some(Answer::State(snapshot(state)))),
+        Request::Get(Query::Warnings) => {
+            Reply::Ok(Some(Answer::Warnings(state.settings.warnings.clone())))
+        }
         Request::Get(Query::Version) => {
             Reply::Ok(Some(Answer::Version(env!("CARGO_PKG_VERSION").into())))
         }

Modified file: crates/monolith/src/main.rs+2 additions@@ -99,6 +99,7 @@ enum Backend {
 enum What {
     State,
     Version,
+    Warnings,
 }
 
 fn main() -> ExitCode {
@@ -123,6 +124,7 @@ fn main() -> ExitCode {
             return ipc::client(Request::Get(match what {
                 What::State => Query::State,
                 What::Version => Query::Version,
+                What::Warnings => Query::Warnings,
             }));
         }
         Some(Cmd::Subscribe) => return ipc::client(Request::Subscribe {}),

Modified file: crates/monolith/src/state.rs+12 additions−11 deletions@@ -122,15 +122,16 @@ impl State {
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let dh = display.handle();
         let config_path = config_path.or_else(Config::path);
-        let config = match Config::load(config_path.as_deref()) {
-            Ok(loaded) => crate::commands::warn_config(loaded),
-            Err(e) => {
-                tracing::error!("config: {e}, using the built-in default");
-                Config::parse(monolith_config::DEFAULT)
-                    .expect("the default config parses")
-                    .config
-            }
-        };
+        let loaded = Config::load(config_path.as_deref()).or_else(|e| {
+            tracing::error!("config: {e}, using the built-in default");
+            let mut default = Config::parse(monolith_config::DEFAULT)?;
+            default
+                .warnings
+                .push(format!("{e}, using the built-in default"));
+            Ok::<_, monolith_config::Error>(default)
+        });
+        let (config, binds, warnings) =
+            crate::commands::adopt(loaded.expect("the default config parses"));
         let renderer = match gpu {
             Some(node) => VulkanRenderer::for_node(node)?,
             None => VulkanRenderer::new()?,
@@ -182,10 +183,10 @@ impl State {
                 start: Instant::now(),
             },
             settings: Settings {
-                binds: Binds::new(&config),
+                binds,
                 config,
                 path: config_path,
-                warnings: Vec::new(),
+                warnings,
             },
             renderer,
             wm: Wm::new(layout, Animator::new(animation)),

monolith

Commit 01e6a6d74d49

Commit `01e6a6d74d49`