[#103,!277] Regenerated message files.

diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc
index 46e0efdaf143aa71dab23dd319e9dea9e81fefca..45c82e4644e07789d350d8ee06d8a6b9493bb07f 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.cc
+++ b/src/bin/dhcp4/dhcp4_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Fri Feb 08 2019 20:32
+// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Tue Mar 19 2019 10:21
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -25,9 +25,7 @@ extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS = "DHCP4_CLIENT_H
 extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL = "DHCP4_CLIENT_NAME_PROC_FAIL";
 extern const isc::log::MessageID DHCP4_COMMAND_RECEIVED = "DHCP4_COMMAND_RECEIVED";
 extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE = "DHCP4_CONFIG_COMPLETE";
-extern const isc::log::MessageID DHCP4_CONFIG_FETCH = "DHCP4_CONFIG_FETCH";
 extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL = "DHCP4_CONFIG_LOAD_FAIL";
-extern const isc::log::MessageID DHCP4_CONFIG_MERGED = "DHCP4_CONFIG_MERGED";
 extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET = "DHCP4_CONFIG_NEW_SUBNET";
 extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE = "DHCP4_CONFIG_OPTION_DUPLICATE";
 extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE = "DHCP4_CONFIG_PACKET_QUEUE";
@@ -158,9 +156,7 @@ const char* values[] = {
     "DHCP4_CLIENT_NAME_PROC_FAIL", "%1: failed to process the fqdn or hostname sent by a client: %2",
     "DHCP4_COMMAND_RECEIVED", "received command %1, arguments: %2",
     "DHCP4_CONFIG_COMPLETE", "DHCPv4 server has completed configuration: %1",
-    "DHCP4_CONFIG_FETCH", "Fetching configuration data from config backends.",
     "DHCP4_CONFIG_LOAD_FAIL", "configuration error using file: %1, reason: %2",
-    "DHCP4_CONFIG_MERGED", "Configuration backend data has been merged.",
     "DHCP4_CONFIG_NEW_SUBNET", "a new subnet has been added to configuration: %1",
     "DHCP4_CONFIG_OPTION_DUPLICATE", "multiple options with the code %1 added to the subnet %2",
     "DHCP4_CONFIG_PACKET_QUEUE", "DHCPv4 packet queue info after configuration: %1",

diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h
index dbcf0050a24f0af186b78a5182c53061d1269f53..c240a8464e5aca9c042d0b4ed934ccd46ea65039 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.h
+++ b/src/bin/dhcp4/dhcp4_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Fri Feb 08 2019 20:32
+// File created from ../../../src/bin/dhcp4/dhcp4_messages.mes on Tue Mar 19 2019 10:21
 
 #ifndef DHCP4_MESSAGES_H
 #define DHCP4_MESSAGES_H
@@ -26,9 +26,7 @@ extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS;
 extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL;
 extern const isc::log::MessageID DHCP4_COMMAND_RECEIVED;
 extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE;
-extern const isc::log::MessageID DHCP4_CONFIG_FETCH;
 extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL;
-extern const isc::log::MessageID DHCP4_CONFIG_MERGED;
 extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET;
 extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE;
 extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE;

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index eccc3e688b910c0bfe3569293de183f11fd7c363..7612e2fa925b54acb9c5926445b8cd4fe2aec6ab 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -120,21 +120,12 @@ new configuration. It is output during server startup, and when an updated
 configuration is committed by the administrator.  Additional information
 may be provided.
 
-% DHCP4_CONFIG_FETCH Fetching configuration data from config backends.
-This is an informational message emitted when the DHCPv4 server about to begin
-retrieving configuration data from one or more configuration backends.
-
 % DHCP4_CONFIG_LOAD_FAIL configuration error using file: %1, reason: %2
 This error message indicates that the DHCPv4 configuration has failed.
 If this is an initial configuration (during server's startup) the server
 will fail to start. If this is a dynamic reconfiguration attempt the
 server will continue to use an old configuration.
 
-% DHCP4_CONFIG_MERGED Configuration backend data has been merged.
-This is an informational message emitted when the DHCPv4 server has
-successfully merged configuration data retrieved from its configuration
-backends into the current configuration.
-
 % DHCP4_CONFIG_NEW_SUBNET a new subnet has been added to configuration: %1
 This is an informational message reporting that the configuration has
 been extended to include the specified IPv4 subnet.

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index 4b1e8b7ae7e62cad4aeae4d48770cfddea7ec4e0..0b33bf120ef399138d83aba5c2dc673cef27e672 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Fri Feb 08 2019 20:31
+// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Tue Mar 19 2019 10:19
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -13,6 +13,7 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6 = "DHCPSRV_CFGMGR_AD
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE = "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CFG_DHCP_DDNS = "DHCPSRV_CFGMGR_CFG_DHCP_DDNS";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES = "DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES";
+extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG4_MERGED = "DHCPSRV_CFGMGR_CONFIG4_MERGED";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIGURE_SERVERID = "DHCPSRV_CFGMGR_CONFIGURE_SERVERID";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET4 = "DHCPSRV_CFGMGR_DEL_SUBNET4";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET6 = "DHCPSRV_CFGMGR_DEL_SUBNET6";
@@ -243,6 +244,7 @@ const char* values[] = {
     "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE", "enabling listening on all interfaces",
     "DHCPSRV_CFGMGR_CFG_DHCP_DDNS", "Setting DHCP-DDNS configuration to: %1",
     "DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES", "stop listening on all interfaces",
+    "DHCPSRV_CFGMGR_CONFIG4_MERGED", "Configuration backend data has been merged.",
     "DHCPSRV_CFGMGR_CONFIGURE_SERVERID", "server configuration includes specification of a server identifier",
     "DHCPSRV_CFGMGR_DEL_SUBNET4", "IPv4 subnet %1 removed",
     "DHCPSRV_CFGMGR_DEL_SUBNET6", "IPv6 subnet %1 removed",

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h
index 2b7b72b621344b46251417dd6b04003bc9cc6058..b9bc9550293fb8f9adfaac493c837d503efb05a6 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.h
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Fri Feb 08 2019 20:31
+// File created from ../../../src/lib/dhcpsrv/dhcpsrv_messages.mes on Tue Mar 19 2019 10:19
 
 #ifndef DHCPSRV_MESSAGES_H
 #define DHCPSRV_MESSAGES_H
@@ -14,6 +14,7 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CFG_DHCP_DDNS;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES;
+extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG4_MERGED;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIGURE_SERVERID;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET4;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET6;

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index 336f954b2f0ba0eba6a3bd9d87cbefa8ddba80c4..56a500a5a7b4cf396339ef2a07e3578faa06ab40 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -31,6 +31,11 @@ of active interfaces. This doesn't prevent the server from listening to
 the DHCP traffic through open sockets, but will rather be used by Interface
 Manager to select active interfaces when sockets are re-opened.
 
+% DHCPSRV_CFGMGR_CONFIG4_MERGED Configuration backend data has been merged.
+This is an informational message emitted when the DHCPv4 server has
+successfully merged configuration data retrieved from its configuration
+backends into the current configuration.
+
 % DHCPSRV_CFGMGR_CONFIGURE_SERVERID server configuration includes specification of a server identifier
 This warning message is issued when the server specified configuration of
 a server identifier. If this new configuration overrides an existing

diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc
index 8835b693a6e726b8d4fd9f9aa8e9806299aeb956..2b10a549ea462972027fdf9d9df1a70bcf2b7042 100644 (file)
--- a/src/lib/process/process_messages.cc
+++ b/src/lib/process/process_messages.cc
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/process/process_messages.mes on Fri Feb 08 2019 20:30
+// File created from ../../../src/lib/process/process_messages.mes on Tue Mar 19 2019 10:06
 
 #include <cstddef>
 #include <log/message_types.h>
@@ -15,6 +15,7 @@ extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD = "DCTL_CFG_F
 extern const isc::log::MessageID DCTL_COMMAND_RECEIVED = "DCTL_COMMAND_RECEIVED";
 extern const isc::log::MessageID DCTL_CONFIG_CHECK_COMPLETE = "DCTL_CONFIG_CHECK_COMPLETE";
 extern const isc::log::MessageID DCTL_CONFIG_COMPLETE = "DCTL_CONFIG_COMPLETE";
+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_LOAD_FAIL = "DCTL_CONFIG_LOAD_FAIL";
 extern const isc::log::MessageID DCTL_CONFIG_START = "DCTL_CONFIG_START";
@@ -23,6 +24,7 @@ extern const isc::log::MessageID DCTL_CONFIG_UPDATE = "DCTL_CONFIG_UPDATE";
 extern const isc::log::MessageID DCTL_INIT_PROCESS = "DCTL_INIT_PROCESS";
 extern const isc::log::MessageID DCTL_INIT_PROCESS_FAIL = "DCTL_INIT_PROCESS_FAIL";
 extern const isc::log::MessageID DCTL_NOT_RUNNING = "DCTL_NOT_RUNNING";
+extern const isc::log::MessageID DCTL_OPEN_CONFIG_DB = "DCTL_OPEN_CONFIG_DB";
 extern const isc::log::MessageID DCTL_PARSER_FAIL = "DCTL_PARSER_FAIL";
 extern const isc::log::MessageID DCTL_PID_FILE_ERROR = "DCTL_PID_FILE_ERROR";
 extern const isc::log::MessageID DCTL_PROCESS_FAILED = "DCTL_PROCESS_FAILED";
@@ -49,6 +51,7 @@ const char* values[] = {
     "DCTL_COMMAND_RECEIVED", "%1 received command: %2, arguments: %3",
     "DCTL_CONFIG_CHECK_COMPLETE", "server has completed configuration check: %1, result: %2",
     "DCTL_CONFIG_COMPLETE", "server has completed configuration: %1",
+    "DCTL_CONFIG_FETCH", "Fetching configuration data from config backends.",
     "DCTL_CONFIG_FILE_LOAD_FAIL", "%1 reason: %2",
     "DCTL_CONFIG_LOAD_FAIL", "%1 configuration failed to load: %2",
     "DCTL_CONFIG_START", "parsing new configuration: %1",
@@ -57,6 +60,7 @@ const char* values[] = {
     "DCTL_INIT_PROCESS", "%1 initializing the application",
     "DCTL_INIT_PROCESS_FAIL", "%1 application initialization failed: %2",
     "DCTL_NOT_RUNNING", "%1 application instance is not running",
+    "DCTL_OPEN_CONFIG_DB", "Opening configuration database: %1",
     "DCTL_PARSER_FAIL", ": %1",
     "DCTL_PID_FILE_ERROR", "%1 could not create a PID file: %2",
     "DCTL_PROCESS_FAILED", "%1 application execution failed: %2",

diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h
index 3f3db67595bd06828894fcedded70f9c9bcb39ab..282c7805ee30f48a50663164d72f8d789b2cf2db 100644 (file)
--- a/src/lib/process/process_messages.h
+++ b/src/lib/process/process_messages.h
@@ -1,4 +1,4 @@
-// File created from ../../../src/lib/process/process_messages.mes on Fri Feb 08 2019 20:30
+// File created from ../../../src/lib/process/process_messages.mes on Tue Mar 19 2019 10:06
 
 #ifndef PROCESS_MESSAGES_H
 #define PROCESS_MESSAGES_H
@@ -16,6 +16,7 @@ extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD;
 extern const isc::log::MessageID DCTL_COMMAND_RECEIVED;
 extern const isc::log::MessageID DCTL_CONFIG_CHECK_COMPLETE;
 extern const isc::log::MessageID DCTL_CONFIG_COMPLETE;
+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_LOAD_FAIL;
 extern const isc::log::MessageID DCTL_CONFIG_START;
@@ -24,6 +25,7 @@ extern const isc::log::MessageID DCTL_CONFIG_UPDATE;
 extern const isc::log::MessageID DCTL_INIT_PROCESS;
 extern const isc::log::MessageID DCTL_INIT_PROCESS_FAIL;
 extern const isc::log::MessageID DCTL_NOT_RUNNING;
+extern const isc::log::MessageID DCTL_OPEN_CONFIG_DB;
 extern const isc::log::MessageID DCTL_PARSER_FAIL;
 extern const isc::log::MessageID DCTL_PID_FILE_ERROR;
 extern const isc::log::MessageID DCTL_PROCESS_FAILED;