Process review commens from @fredmorcos, thanks!

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 520eebf6550113d7f15f1cff7f9f543afe374e94..e8c940181b7c852f07d59a0147341dda4b8c5894 100644 (file)
--- 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 96992c84fb45de1f8593fdc08f8c7cb095437e5b..8eee2e7c1722921ba04d603ea71bc903cf952a1c 100644 (file)
--- 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"));
   }
 }