monolith

public

Star0

Fork 0

Watch0

114 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `38314f607eb9`

tarball

atagen <boss@atagen.co>2026-10-17 10:29 UTC

3 files changed+63-15

monolith: log to a file under XDG_STATE_HOME and report config warnings

A session started from a display manager had its stderr scattered or discarded, so rejected config options were invisible. The previous run's log is kept beside it, and nested runs log separately so testing does not clobber the host session's log.

Modified file: crates/monolith/src/commands.rs+11 additions−3 deletions@@ -207,10 +207,11 @@ impl State {
         }
     }
 
-    /// Swaps in a freshly parsed config. A broken file leaves the running
-    /// config untouched.
+    /// Swaps in a freshly parsed config. A file that is not TOML leaves the
+    /// running config untouched.
     pub fn reload(&mut self) -> Result<(), String> {
-        let config = Config::load(self.settings.path.as_deref()).map_err(|e| e.to_string())?;
+        let loaded = Config::load(self.settings.path.as_deref()).map_err(|e| e.to_string())?;
+        let config = warn_config(loaded);
         let keyboard_changed = config.keyboard != self.settings.config.keyboard;
         self.settings.binds = Binds::new(&config);
         self.wm.layout.gaps = crate::state::gaps(&config);
@@ -223,3 +224,10 @@ impl State {
         Ok(())
     }
 }
+
+pub fn warn_config(loaded: monolith_config::Loaded) -> Config {
+    for w in &loaded.warnings {
+        tracing::warn!("config: {w}");
+    }
+    loaded.config
+}

Modified file: crates/monolith/src/main.rs+43 additions−8 deletions@@ -116,11 +116,26 @@ fn main() -> ExitCode {
         }
         Some(Cmd::Subscribe) => return ipc::client(Request::Subscribe {}),
     };
-    let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    let backend = match backend {
+        Backend::Auto if std::env::var_os("WAYLAND_DISPLAY").is_some() => Backend::Nested,
+        Backend::Auto => Backend::Drm,
+        b => b,
+    };
+    let filter = || EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
     let fmt = tracing_subscriber::fmt::layer()
         .with_writer(std::io::stderr)
         .with_ansi(std::io::IsTerminal::is_terminal(&std::io::stderr()))
-        .with_filter(filter);
+        .with_filter(filter());
+    let log_path = log_file(backend);
+    let file = log_path.as_ref().and_then(|p| {
+        let file = std::fs::File::create(p).ok()?;
+        Some(
+            tracing_subscriber::fmt::layer()
+                .with_writer(std::sync::Mutex::new(file))
+                .with_ansi(false)
+                .with_filter(filter()),
+        )
+    });
     #[cfg(feature = "spans")]
     let slow = slow_spans::SlowSpans::from_env();
     #[cfg(feature = "spans")]
@@ -129,14 +144,16 @@ fn main() -> ExitCode {
     let spans = Some(slow.with_filter(tracing_subscriber::filter::LevelFilter::TRACE));
     #[cfg(not(feature = "spans"))]
     let spans: Option<tracing_subscriber::layer::Identity> = None;
-    tracing_subscriber::registry().with(fmt).with(spans).init();
+    tracing_subscriber::registry()
+        .with(fmt)
+        .with(file)
+        .with(spans)
+        .init();
+    if let Some(p) = &log_path {
+        tracing::info!(path = %p.display(), "logging to a file");
+    }
     #[cfg(feature = "spans")]
     tracing::info!("logging spans slower than {threshold_us} us");
-    let backend = match backend {
-        Backend::Auto if std::env::var_os("WAYLAND_DISPLAY").is_some() => Backend::Nested,
-        Backend::Auto => Backend::Drm,
-        b => b,
-    };
     match run(config, backend, &program) {
         Ok(()) => ExitCode::SUCCESS,
         Err(e) => {
@@ -146,6 +163,24 @@ fn main() -> ExitCode {
     }
 }
 
+/// `$XDG_STATE_HOME/monolith/monolith.log`, with the previous run kept as
+/// `monolith.old.log`. Nested runs log beside it, so testing one does not
+/// overwrite the log of the session hosting it.
+fn log_file(backend: Backend) -> Option<PathBuf> {
+    let dir = std::env::var_os("XDG_STATE_HOME")
+        .map(PathBuf::from)
+        .or_else(|| std::env::var_os("HOME").map(|h| PathBuf::from(h).join(".local/state")))?
+        .join("monolith");
+    std::fs::create_dir_all(&dir).ok()?;
+    let name = match backend {
+        Backend::Nested => "nested",
+        _ => "monolith",
+    };
+    let path = dir.join(format!("{name}.log"));
+    let _ = std::fs::rename(&path, dir.join(format!("{name}.old.log")));
+    Some(path)
+}
+
 /// Puts the compositor thread on SCHED_RR so a busy desktop cannot delay a
 /// frame. Reset-on-fork keeps threads and programs it starts off realtime.
 /// The NixOS capability wrapper raises CAP_SYS_NICE as an ambient capability,

Modified file: crates/monolith/src/state.rs+9 additions−4 deletions@@ -102,10 +102,15 @@ impl State {
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let dh = display.handle();
         let config_path = config_path.or_else(Config::path);
-        let config = Config::load(config_path.as_deref()).unwrap_or_else(|e| {
-            tracing::error!("config: {e}, using the built-in default");
-            Config::parse(monolith_config::DEFAULT).expect("the default config parses")
-        });
+        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 renderer = match gpu {
             Some(node) => VulkanRenderer::for_node(node)?,
             None => VulkanRenderer::new()?,

monolith

Commit 38314f607eb9

Commit `38314f607eb9`