From 3056b38256a084d4377a89aecccb7948f07e9b9e Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 13 Oct 2023 09:53:43 +0200 Subject: [PATCH] Print version earlier, logging tweak --- pdns/recursordist/rec-main.cc | 3 +-- pdns/recursordist/settings/cxxsupport.cc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index f61c819683..51f3bdabd3 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -2028,8 +2028,6 @@ static int serviceMain(Logr::log_t log) } } - showProductVersion(); - g_disthashseed = dns_random_uint32(); int ret = initNet(log); @@ -3314,6 +3312,7 @@ int main(int argc, char** argv) } g_log.setLoglevel(s_logUrgency); g_log.toConsole(s_logUrgency); + showProductVersion(); g_yamlSettings = false; string configname = ::arg()["config-dir"] + "/recursor"; diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc index 051ca54b5f..0251fbae7b 100644 --- a/pdns/recursordist/settings/cxxsupport.cc +++ b/pdns/recursordist/settings/cxxsupport.cc @@ -124,12 +124,12 @@ void pdns::settings::rec::oldStyleAllowFileToBridgeStruct(const std::string& fil static void mergeYamlSubFile(const std::string& configname, Recursorsettings& settings, Logr::log_t log) { - SLOG(g_log << Logger::Notice << "Processing YAML settings from " << configname << endl, - log->info(Logr::Notice, "Processing YAML settings", "path", Logging::Loggable(configname))); auto file = ifstream(configname); if (!file.is_open()) { throw runtime_error("Cannot open " + configname); } + SLOG(g_log << Logger::Notice << "Processing YAML settings from " << configname << endl, + log->info(Logr::Notice, "Processing YAML settings", "path", Logging::Loggable(configname))); auto data = string(std::istreambuf_iterator(file), std::istreambuf_iterator()); pdns::rust::settings::rec::merge(settings, data); } -- 2.47.2