From 70099a45e09364edef1a624d5993cc5358d1afcb Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 10 Jun 2022 08:18:09 +0200 Subject: [PATCH] Process review commens from @fredmorcos, thanks! --- pdns/recursordist/rec-main.cc | 6 +++--- pdns/remote_logger.cc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index 520eebf655..e8c940181b 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -1934,7 +1934,7 @@ static void handleRCC(int fd, FDMultiplexer::funcparam_t& var) } string msg = g_rcc.recv(clientfd).d_str; SLOG(g_log << Logger::Info << "Received rec_control command '" << msg << "' via controlsocket" << endl, - log->info(Logr::Info, "Received rec_control command via controlsocket", "command", Logging::Loggable(msg))); + log->info(Logr::Info, "Received rec_control command via control socket", "command", Logging::Loggable(msg))); RecursorControlParser rcp; RecursorControlParser::func_t* command; @@ -1945,11 +1945,11 @@ static void handleRCC(int fd, FDMultiplexer::funcparam_t& var) } catch (const std::exception& e) { SLOG(g_log << Logger::Error << "Error dealing with control socket request: " << e.what() << endl, - log->error(Logr::Error, e.what(), "Exception while dealing with control request", "exception", Logging::Loggable("std::exception"))); + log->error(Logr::Error, e.what(), "Exception while dealing with control socket request", "exception", Logging::Loggable("std::exception"))); } catch (const PDNSException& ae) { SLOG(g_log << Logger::Error << "Error dealing with control socket request: " << ae.reason << endl, - log->error(Logr::Error, ae.reason, "Exception while dealing with control request", "exception", Logging::Loggable("PDNSException"))); + log->error(Logr::Error, ae.reason, "Exception while dealing with control socket request", "exception", Logging::Loggable("PDNSException"))); } } diff --git a/pdns/remote_logger.cc b/pdns/remote_logger.cc index 96992c84fb..8eee2e7c17 100644 --- a/pdns/remote_logger.cc +++ b/pdns/remote_logger.cc @@ -224,12 +224,12 @@ void RemoteLogger::maintenanceThread() } catch (const std::exception& e) { - SLOG(cerr << "Remote Logger's maintenance thead died on: " << e.what() << endl, - g_slog->withName("protobuf")->error(Logr::Error, e.what(), "Remote Logger's maintenance thead died")); + SLOG(cerr << "Remote Logger's maintenance thread died on: " << e.what() << endl, + g_slog->withName("protobuf")->error(Logr::Error, e.what(), "Remote Logger's maintenance thread died")); } catch (...) { - SLOG(cerr << "Remote Logger's maintenance thead died on unknown exception" << endl, - g_slog->withName("protobuf")->info(Logr::Error, "Remote Logger's maintenance thead died")); + SLOG(cerr << "Remote Logger's maintenance thread died on unknown exception" << endl, + g_slog->withName("protobuf")->info(Logr::Error, "Remote Logger's maintenance thread died")); } } -- 2.47.2