[#3594] deprecate output_options

diff --git a/src/lib/process/log_parser.cc b/src/lib/process/log_parser.cc
index 7e06ac32c3b515cd3e3a73b54cdbfbbfa7a298c5..c0cc19683d42ae9be8b80f112f10ce50e55526c5 100644 (file)
--- a/src/lib/process/log_parser.cc
+++ b/src/lib/process/log_parser.cc
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <cc/data.h>
+#include <process/d_log.h>
 #include <process/log_parser.h>
 #include <boost/lexical_cast.hpp>
 #include <log/logger_specification.h>
@@ -111,6 +112,7 @@ void LogConfigParser::parseConfigEntry(isc::data::ConstElementPtr entry) {
     }
 
     if (deprecated_output_options) {
+        LOG_WARN(dctl_logger, DCTL_DEPRECATED_OUTPUT_OPTIONS);
         output_options = deprecated_output_options;
         ElementPtr mutable_element = boost::const_pointer_cast<Element>(entry);
         mutable_element->remove("output_options");

diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc
index bd01e3d7076685d8be70a82bf9298890df33be63..8f5e42c9c160a38e220a285760323794056cf9d2 100644 (file)
--- a/src/lib/process/process_messages.cc
+++ b/src/lib/process/process_messages.cc
@@ -17,6 +17,7 @@ extern const isc::log::MessageID DCTL_CONFIG_FETCH = "DCTL_CONFIG_FETCH";
 extern const isc::log::MessageID DCTL_CONFIG_FILE_LOAD_FAIL = "DCTL_CONFIG_FILE_LOAD_FAIL";
 extern const isc::log::MessageID DCTL_CONFIG_START = "DCTL_CONFIG_START";
 extern const isc::log::MessageID DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED = "DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED";
+extern const isc::log::MessageID DCTL_DEPRECATED_OUTPUT_OPTIONS = "DCTL_DEPRECATED_OUTPUT_OPTIONS";
 extern const isc::log::MessageID DCTL_DEVELOPMENT_VERSION = "DCTL_DEVELOPMENT_VERSION";
 extern const isc::log::MessageID DCTL_INIT_PROCESS = "DCTL_INIT_PROCESS";
 extern const isc::log::MessageID DCTL_INIT_PROCESS_FAIL = "DCTL_INIT_PROCESS_FAIL";
@@ -49,6 +50,7 @@ const char* values[] = {
     "DCTL_CONFIG_FILE_LOAD_FAIL", "%1 reason: %2",
     "DCTL_CONFIG_START", "parsing new configuration: %1",
     "DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED", "Failed to connect to database: %1 with error: %2",
+    "DCTL_DEPRECATED_OUTPUT_OPTIONS", "The output_options parameter is deprecated. Use output-options parameter instead.",
     "DCTL_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.",
     "DCTL_INIT_PROCESS", "%1 initializing the application",
     "DCTL_INIT_PROCESS_FAIL", "%1 application initialization failed: %2",

diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h
index 316cc7abcc84a7caddddfff26386c93a9559e7ed..f79e7db4d5d8e91f1f4f44ee4e1e7264ec5b37be 100644 (file)
--- a/src/lib/process/process_messages.h
+++ b/src/lib/process/process_messages.h
@@ -18,6 +18,7 @@ extern const isc::log::MessageID DCTL_CONFIG_FETCH;
 extern const isc::log::MessageID DCTL_CONFIG_FILE_LOAD_FAIL;
 extern const isc::log::MessageID DCTL_CONFIG_START;
 extern const isc::log::MessageID DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED;
+extern const isc::log::MessageID DCTL_DEPRECATED_OUTPUT_OPTIONS;
 extern const isc::log::MessageID DCTL_DEVELOPMENT_VERSION;
 extern const isc::log::MessageID DCTL_INIT_PROCESS;
 extern const isc::log::MessageID DCTL_INIT_PROCESS_FAIL;

diff --git a/src/lib/process/process_messages.mes b/src/lib/process/process_messages.mes
index 7d85ddff4fcb13530e8b1d28fd9be28fc6fca82b..f984f7305bf679febaf9a8f06cbc797080fe8c36 100644 (file)
--- a/src/lib/process/process_messages.mes
+++ b/src/lib/process/process_messages.mes
@@ -61,6 +61,10 @@ the configuration database. The operation started a retry to connect procedure.
 The database access string with password redacted is logged, along with the
 error and details for the reconnect procedure.
 
+% DCTL_DEPRECATED_OUTPUT_OPTIONS The output_options parameter is deprecated. Use output-options parameter instead.
+This warning message is displayed when deprecated output_options is used instead
+of output-options.
+
 % DCTL_DEVELOPMENT_VERSION This software is a development branch of Kea. It is not recommended for production use.
 This warning message is displayed when the version is a development
 (vs stable) one: the second number of the version is odd.