alacritty

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 53e491709d75477f8efe181315fe9301c6e845ba
parent 863d5581a6b9917a4000d59f449653eb1ddd6dee
Author: Christian Duerr <chrisduerr@users.noreply.github.com>
Date:   Sat,  2 Feb 2019 12:03:03 +0000

Fix reloading with empty config

When loading an empty configuration file, Alacritty only prints an info
message and then proceeds to load the default config. However when
reloading the configuration file it would throw a hard error.

This has been fixed and a hard error is now only thrown when an error is
returned during reload which isn't the empty file error.

Diffstat:
MCHANGELOG.md | 1+
Msrc/config/mod.rs | 35++++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Resolved off-by-one issue with erasing characters in the last column - Excessive polling every 100ms with `live_config_reload` enabled - Unicode characters at the beginning of URLs are now properly ignored +- Remove error message when reloading an empty config ## Version 0.2.7 diff --git a/src/config/mod.rs b/src/config/mod.rs @@ -2224,18 +2224,31 @@ impl Monitor { loop { match rx.recv().expect("watcher event") { DebouncedEvent::Rename(_, _) => continue, - DebouncedEvent::Write(path) | DebouncedEvent::Create(path) - | DebouncedEvent::Chmod(path) => { - // Reload file - if path == config_path { - match Config::load_from(path) { - Ok(config) => { - let _ = config_tx.send(config); - handler.on_config_reload(); - }, - Err(err) => error!("Ignoring invalid config: {}", err), + DebouncedEvent::Write(path) + | DebouncedEvent::Create(path) + | DebouncedEvent::Chmod(path) => + { + if path != config_path { + continue; + } + + let config = match Config::load_from(&path) { + Ok(config) => { + config + }, + Err(err) => { + if let Error::Empty = err { + info!("Config file {:?} is empty; loading default", path); + Config::default() + } else { + error!("Ignoring invalid config: {}", err); + continue; + } } - } + }; + + let _ = config_tx.send(config); + handler.on_config_reload(); } _ => {} }