Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept empty configuration as no configuration #246

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Accept empty configuration as no configuration #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions main/kernel/Configuration.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,15 @@ class ConfigurationFile {
JsonDocument json;
DeserializationError error = deserializeJson(json, file);
file.close();
if (error) {
throw ConfigurationException("Cannot open config file " + path + " (" + String(error.c_str()) + ")");
switch (error.code()) {
case DeserializationError::Code::Ok:
break;
case DeserializationError::Code::EmptyInput:
Log.debug("The configuration file '%s' is empty, falling back to defaults",
path.c_str());
break;
default:
throw ConfigurationException("Cannot open config file " + path + " (" + String(error.c_str()) + ")");
}
update(json.as<JsonObject>());
Log.info("Effective configuration for '%s': %s",
Expand Down
Loading