From 7db9ee486d00c069afab76f4115eb6afe35d41f3 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 9 Sep 2025 13:55:21 +0200 Subject: [PATCH] rec: better error message when reload-yaml fails Signed-off-by: Otto Moerbeek --- pdns/recursordist/rec-rust-lib/cxxsettings.hh | 2 +- pdns/recursordist/rec-rust-lib/cxxsupport.cc | 4 ++-- pdns/recursordist/rec_channel_rec.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/recursordist/rec-rust-lib/cxxsettings.hh b/pdns/recursordist/rec-rust-lib/cxxsettings.hh index 0d65b121d..cf4fc318c 100644 --- a/pdns/recursordist/rec-rust-lib/cxxsettings.hh +++ b/pdns/recursordist/rec-rust-lib/cxxsettings.hh @@ -55,5 +55,5 @@ void setArgsForACLRelatedSettings(pdns::rust::settings::rec::Recursorsettings& s void fromLuaConfigToBridgeStruct(LuaConfigItems& luaConfig, const ProxyMapping& proxyMapping, pdns::rust::settings::rec::Recursorsettings& settings); void fromBridgeStructToLuaConfig(const pdns::rust::settings::rec::Recursorsettings& settings, LuaConfigItems& luaConfig, ProxyMapping& proxyMapping); bool luaItemSet(const pdns::rust::settings::rec::Recursorsettings& settings); -YamlSettingsStatus tryReadYAML(const string& yamlconfigname, bool setGlobals, bool& yamlSettings, bool& luaSettingsInYAML, rust::settings::rec::Recursorsettings& settings, Logr::log_t startupLog); +YamlSettingsStatus tryReadYAML(const string& yamlconfigname, bool setGlobals, bool& yamlSettings, bool& luaSettingsInYAML, rust::settings::rec::Recursorsettings& settings, Logr::log_t startupLog, Logr::Priority level = Logr::Debug); } diff --git a/pdns/recursordist/rec-rust-lib/cxxsupport.cc b/pdns/recursordist/rec-rust-lib/cxxsupport.cc index 31ec15dc0..0c0d1b38b 100644 --- a/pdns/recursordist/rec-rust-lib/cxxsupport.cc +++ b/pdns/recursordist/rec-rust-lib/cxxsupport.cc @@ -1398,7 +1398,7 @@ bool pdns::settings::rec::luaItemSet(const pdns::rust::settings::rec::Recursorse return !alldefault; } -pdns::settings::rec::YamlSettingsStatus pdns::settings::rec::tryReadYAML(const string& yamlconfigname, bool setGlobals, bool& yamlSettings, bool& luaSettingsInYAML, rust::settings::rec::Recursorsettings& settings, Logr::log_t startupLog) +pdns::settings::rec::YamlSettingsStatus pdns::settings::rec::tryReadYAML(const string& yamlconfigname, bool setGlobals, bool& yamlSettings, bool& luaSettingsInYAML, rust::settings::rec::Recursorsettings& settings, Logr::log_t startupLog, Logr::Priority level) { string msg; // TODO: handle include-dir on command line @@ -1406,7 +1406,7 @@ pdns::settings::rec::YamlSettingsStatus pdns::settings::rec::tryReadYAML(const s switch (yamlstatus) { case pdns::settings::rec::YamlSettingsStatus::CannotOpen: - startupLog->error(Logr::Debug, msg, "No YAML config found", "configname", Logging::Loggable(yamlconfigname)); + startupLog->error(level, msg, "No YAML config found", "configname", Logging::Loggable(yamlconfigname)); break; case pdns::settings::rec::YamlSettingsStatus::PresentButFailed: diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc index 0289388fa..d04405092 100644 --- a/pdns/recursordist/rec_channel_rec.cc +++ b/pdns/recursordist/rec_channel_rec.cc @@ -1989,9 +1989,9 @@ RecursorControlChannel::Answer luaconfig(bool broadcast) bool dummy1{}; bool dummy2{}; pdns::rust::settings::rec::Recursorsettings settings; - auto yamlstat = pdns::settings::rec::tryReadYAML(configname + g_yamlSettingsSuffix, false, dummy1, dummy2, settings, g_slog); + auto yamlstat = pdns::settings::rec::tryReadYAML(configname + g_yamlSettingsSuffix, false, dummy1, dummy2, settings, g_slog, Logr::Error); if (yamlstat != pdns::settings::rec::YamlSettingsStatus::OK) { - return {1, "Not reloading dynamic part of YAML configuration\n"}; + return {1, "Reloading dynamic part of YAML configuration failed\n"}; } auto generation = g_luaconfs.getLocal()->generation; lci.generation = generation + 1; -- 2.47.3