From 0c2ec614af6a7f05557ec0a4480ff710bdd97418 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 3 Mar 2023 09:25:27 +0100 Subject: [PATCH] rec: Backport 12495 to rex-4.8.x: Change a few logging urgency levels Backport of #12495 --- pdns/rec-lua-conf.cc | 2 +- pdns/recursordist/rec-main.cc | 8 ++++---- pdns/reczones.cc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc index 9ad994b697..ce8bfb034e 100644 --- a/pdns/rec-lua-conf.cc +++ b/pdns/rec-lua-conf.cc @@ -466,7 +466,7 @@ void loadRecursorLuaConfig(const std::string& fname, luaConfigDelayedThreads& de } catch (const std::exception& e) { SLOG(g_log << Logger::Error << "Unable to load RPZ zone from '" << filename << "': " << e.what() << endl, - log->error(Logr::Error, e.what(), "Exception while loadinf RPZ zone from file")); + log->error(Logr::Error, e.what(), "Exception while loading RPZ zone from file")); } }); diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index 4d2cfeab87..343454cd56 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -366,12 +366,12 @@ static FDMultiplexer* getMultiplexer(Logr::log_t log) return ret; } catch (FDMultiplexerException& fe) { - SLOG(g_log << Logger::Error << "Non-fatal error initializing possible multiplexer (" << fe.what() << "), falling back" << endl, - log->error(Logr::Error, fe.what(), "Non-fatal error initializing possible multiplexer, falling back")); + SLOG(g_log << Logger::Warning << "Non-fatal error initializing possible multiplexer (" << fe.what() << "), falling back" << endl, + log->error(Logr::Warning, fe.what(), "Non-fatal error initializing possible multiplexer, falling back")); } catch (...) { - SLOG(g_log << Logger::Error << "Non-fatal error initializing possible multiplexer" << endl, - log->info(Logr::Error, "Non-fatal error initializing possible multiplexer")); + SLOG(g_log << Logger::Warning << "Non-fatal error initializing possible multiplexer" << endl, + log->info(Logr::Warning, "Non-fatal error initializing possible multiplexer")); } } SLOG(g_log << Logger::Error << "No working multiplexer found!" << endl, diff --git a/pdns/reczones.cc b/pdns/reczones.cc index 6777ee1743..4af95fee50 100644 --- a/pdns/reczones.cc +++ b/pdns/reczones.cc @@ -325,8 +325,8 @@ std::tuple, std::shared_ptr> // headers.first=toCanonic("", headers.first); if (n == 0) { ad.d_rdForward = false; - SLOG(g_log << Logger::Error << "Parsing authoritative data for zone '" << headers.first << "' from file '" << headers.second << "'" << endl, - log->info(Logr::Error, "Parsing authoritative data from file", "zone", Logging::Loggable(headers.first), "file", Logging::Loggable(headers.second))); + SLOG(g_log << Logger::Notice << "Parsing authoritative data for zone '" << headers.first << "' from file '" << headers.second << "'" << endl, + log->info(Logr::Notice, "Parsing authoritative data from file", "zone", Logging::Loggable(headers.first), "file", Logging::Loggable(headers.second))); ZoneParserTNG zpt(headers.second, DNSName(headers.first)); zpt.setMaxGenerateSteps(::arg().asNum("max-generate-steps")); zpt.setMaxIncludes(::arg().asNum("max-include-depth")); -- 2.47.2