Skip to content

Commit

Permalink
Merge pull request #13151 from aj-gh/fixtypos
Browse files Browse the repository at this point in the history
Fix a few typos in log messages
  • Loading branch information
rgacogne authored Aug 18, 2023
2 parents 0ff5abb + 84d2423 commit b833e2c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions pdns/recursordist/rec-lua-conf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,12 @@ static void rpzPrimary(LuaConfigItems& lci, luaConfigDelayedThreads& delayedThre
}
catch (const PDNSException& e) {
SLOG(g_log << Logger::Warning << "Unable to pre-load RPZ zone " << zoneName << " from seed file '" << seedFile << "': " << e.reason << endl,
log->error(Logr::Warning, e.reason, "Exception while pre-loadin RPZ zone", "exception", Logging::Loggable("PDNSException")));
log->error(Logr::Warning, e.reason, "Exception while pre-loading RPZ zone", "exception", Logging::Loggable("PDNSException")));
zone->clear();
}
catch (const std::exception& e) {
SLOG(g_log << Logger::Warning << "Unable to pre-load RPZ zone " << zoneName << " from seed file '" << seedFile << "': " << e.what() << endl,
log->error(Logr::Warning, e.what(), "Exception while pre-loadin RPZ zone", "exception", Logging::Loggable("std::exception")));
log->error(Logr::Warning, e.what(), "Exception while pre-loading RPZ zone", "exception", Logging::Loggable("std::exception")));
zone->clear();
}
}
Expand Down Expand Up @@ -690,11 +690,11 @@ void loadRecursorLuaConfig(const std::string& fname, luaConfigDelayedThreads& de
}
catch (std::exception& e) {
SLOG(g_log << Logger::Error << "Error while adding protobuf logger: " << e.what() << endl,
lci.d_slog->error(Logr::Error, e.what(), "Exception while adding protobuf logger", "exception", Logging::Loggable("std::exception")));
lci.d_slog->error(Logr::Error, e.what(), "Exception while adding protobuf logger", "exception", Logging::Loggable("std::exception")));
}
catch (PDNSException& e) {
SLOG(g_log << Logger::Error << "Error while adding protobuf logger: " << e.reason << endl,
lci.d_slog->error(Logr::Error, e.reason, "Exception while adding protobuf logger", "exception", Logging::Loggable("PDNSException")));
lci.d_slog->error(Logr::Error, e.reason, "Exception while adding protobuf logger", "exception", Logging::Loggable("PDNSException")));
}
}
else {
Expand Down Expand Up @@ -907,12 +907,12 @@ void startLuaConfigDelayedThreads(const luaConfigDelayedThreads& delayedThreads,
}
catch (const std::exception& e) {
SLOG(g_log << Logger::Error << "Problem starting RPZIXFRTracker thread: " << e.what() << endl,
g_slog->withName("rpz")->error(Logr::Error, e.what(), "Exception startng RPZIXFRTracker thread", "exception", Logging::Loggable("std::exception")));
g_slog->withName("rpz")->error(Logr::Error, e.what(), "Exception starting RPZIXFRTracker thread", "exception", Logging::Loggable("std::exception")));
exit(1);
}
catch (const PDNSException& e) {
SLOG(g_log << Logger::Error << "Problem starting RPZIXFRTracker thread: " << e.reason << endl,
g_slog->withName("rpz")->error(Logr::Error, e.reason, "Exception startng RPZIXFRTracker thread", "exception", Logging::Loggable("PDNSException")));
g_slog->withName("rpz")->error(Logr::Error, e.reason, "Exception starting RPZIXFRTracker thread", "exception", Logging::Loggable("PDNSException")));
exit(1);
}
}
Expand Down
2 changes: 1 addition & 1 deletion pdns/remote_logger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ bool RemoteLogger::reconnect()
catch (const std::exception& e) {
#ifdef WE_ARE_RECURSOR
SLOG(g_log<<Logger::Warning<<"Error connecting to remote logger "<<d_remote.toStringWithPort()<<": "<<e.what()<<std::endl,
g_slog->withName("protobuf")->error(Logr::Error, e.what(), "Exception while connection to remote logger", "address", Logging::Loggable(d_remote)));
g_slog->withName("protobuf")->error(Logr::Error, e.what(), "Exception while connecting to remote logger", "address", Logging::Loggable(d_remote)));
#else
warnlog("Error connecting to remote logger %s: %s", d_remote.toStringWithPort(), e.what());
#endif
Expand Down

0 comments on commit b833e2c

Please sign in to comment.