[#687] Revert addition of COMMAND_RECEIVED_FROM log message to base_command_mgr.cc

4 files changed, 3 insertions, 22 deletions

diff --git a/src/lib/config/base_command_mgr.cc b/src/lib/config/base_command_mgr.cc
index 978a82f2f8..62eac5264d 100644
--- a/src/lib/config/base_command_mgr.cc
+++ b/src/lib/config/base_command_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2020 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -121,19 +121,8 @@ BaseCommandMgr::processCommand(const isc::data::ConstElementPtr& cmd) {
     try {
         ConstElementPtr arg;
         std::string name = parseCommand(arg, cmd);
-        ConstElementPtr remote = cmd->get(CONTROL_REMOTE_ADDRESS);
-        std::string remote_addr;
-        if (remote && (remote->getType() == Element::string)) {
-            remote_addr = remote->stringValue();
-        }
 
-        if (remote_addr.empty()) {
-            LOG_INFO(command_logger, COMMAND_RECEIVED).arg(name);
-        } else {
-            LOG_INFO(command_logger, COMMAND_RECEIVED_FROM)
-                .arg(name)
-                .arg(remote_addr);
-        }
+        LOG_INFO(command_logger, COMMAND_RECEIVED).arg(name);
 
         ConstElementPtr response = handleCommand(name, arg, cmd);
 
diff --git a/src/lib/config/config_messages.cc b/src/lib/config/config_messages.cc
index 254570c3f3..e4d7ce3825 100644
--- a/src/lib/config/config_messages.cc
+++ b/src/lib/config/config_messages.cc
@@ -16,7 +16,6 @@ extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPING = "COMMAND_HTTP_
 extern const isc::log::MessageID COMMAND_PROCESS_ERROR1 = "COMMAND_PROCESS_ERROR1";
 extern const isc::log::MessageID COMMAND_PROCESS_ERROR2 = "COMMAND_PROCESS_ERROR2";
 extern const isc::log::MessageID COMMAND_RECEIVED = "COMMAND_RECEIVED";
-extern const isc::log::MessageID COMMAND_RECEIVED_FROM = "COMMAND_RECEIVED_FROM";
 extern const isc::log::MessageID COMMAND_REGISTERED = "COMMAND_REGISTERED";
 extern const isc::log::MessageID COMMAND_RESPONSE_ERROR = "COMMAND_RESPONSE_ERROR";
 extern const isc::log::MessageID COMMAND_SOCKET_ACCEPT_FAIL = "COMMAND_SOCKET_ACCEPT_FAIL";
@@ -50,7 +49,6 @@ const char* values[] = {
     "COMMAND_PROCESS_ERROR1", "Error while processing command: %1",
     "COMMAND_PROCESS_ERROR2", "Error while processing command: %1",
     "COMMAND_RECEIVED", "Received command '%1'",
-    "COMMAND_RECEIVED_FROM", "Received command '%1' from %2",
     "COMMAND_REGISTERED", "Command %1 registered",
     "COMMAND_RESPONSE_ERROR", "Server failed to generate response for command: %1",
     "COMMAND_SOCKET_ACCEPT_FAIL", "Failed to accept incoming connection on command socket %1: %2",
diff --git a/src/lib/config/config_messages.h b/src/lib/config/config_messages.h
index bb0f003602..06a88f5bb0 100644
--- a/src/lib/config/config_messages.h
+++ b/src/lib/config/config_messages.h
@@ -17,7 +17,6 @@ extern const isc::log::MessageID COMMAND_HTTP_LISTENER_STOPPING;
 extern const isc::log::MessageID COMMAND_PROCESS_ERROR1;
 extern const isc::log::MessageID COMMAND_PROCESS_ERROR2;
 extern const isc::log::MessageID COMMAND_RECEIVED;
-extern const isc::log::MessageID COMMAND_RECEIVED_FROM;
 extern const isc::log::MessageID COMMAND_REGISTERED;
 extern const isc::log::MessageID COMMAND_RESPONSE_ERROR;
 extern const isc::log::MessageID COMMAND_SOCKET_ACCEPT_FAIL;
diff --git a/src/lib/config/config_messages.mes b/src/lib/config/config_messages.mes
index 90d4b7a69e..8c66529483 100644
--- a/src/lib/config/config_messages.mes
+++ b/src/lib/config/config_messages.mes
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2022 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2021 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -55,11 +55,6 @@ This informational message indicates that a command was received over command
 socket. The nature of this command and its possible results will be logged
 with separate messages.
 
-% COMMAND_RECEIVED_FROM Received command '%1' from %2
-This informational message indicates that a command was received from HTTP.
-Only the command name and the remote address are displayed, other details
-will be logged with separate messages.
-
 % COMMAND_REGISTERED Command %1 registered
 This debug message indicates that the daemon started supporting specified
 command. If the command socket is open, this command can now be issued.