diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-02-06 13:33:42 +0000 |
---|---|---|
committer | Tim Flynn <trflynn89@pm.me> | 2022-02-16 19:49:41 -0500 |
commit | 8260135d4d6cc50d15b459feb6010a989fcb7f5b (patch) | |
tree | 8211a9b8b29b749270c6d71f4faf6073e1a382cb /Userland/Services/ConfigServer | |
parent | 1a4dd47d5f691f77f5a11dbb5cdd8d58b2336245 (diff) | |
download | serenity-8260135d4d6cc50d15b459feb6010a989fcb7f5b.zip |
LibCore+Everywhere: Return ErrorOr from ConfigFile factory methods
I've attempted to handle the errors gracefully where it was clear how to
do so, and simple, but a lot of this was just adding
`release_value_but_fixme_should_propagate_errors()` in places.
Diffstat (limited to 'Userland/Services/ConfigServer')
-rw-r--r-- | Userland/Services/ConfigServer/ClientConnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Services/ConfigServer/ClientConnection.cpp b/Userland/Services/ConfigServer/ClientConnection.cpp index 75dab718ae..35ddf332e8 100644 --- a/Userland/Services/ConfigServer/ClientConnection.cpp +++ b/Userland/Services/ConfigServer/ClientConnection.cpp @@ -37,14 +37,14 @@ static Core::ConfigFile& ensure_domain_config(String const& domain) if (it != s_cache.end()) return *it->value->config; - auto config = Core::ConfigFile::open_for_app(domain, Core::ConfigFile::AllowWriting::Yes); + auto config = Core::ConfigFile::open_for_app(domain, Core::ConfigFile::AllowWriting::Yes).release_value_but_fixme_should_propagate_errors(); // FIXME: Use a single FileWatcher with multiple watches inside. auto watcher_or_error = Core::FileWatcher::create(InodeWatcherFlags::Nonblock); VERIFY(!watcher_or_error.is_error()); auto result = watcher_or_error.value()->add_watch(config->filename(), Core::FileWatcherEvent::Type::ContentModified); VERIFY(!result.is_error()); watcher_or_error.value()->on_change = [config, domain](auto&) { - auto new_config = Core::ConfigFile::open(config->filename(), Core::ConfigFile::AllowWriting::Yes); + auto new_config = Core::ConfigFile::open(config->filename(), Core::ConfigFile::AllowWriting::Yes).release_value_but_fixme_should_propagate_errors(); for (auto& group : config->groups()) { for (auto& key : config->keys(group)) { if (!new_config->has_key(group, key)) { |