[#3144] updated messages

diff --git a/src/lib/dhcpsrv/cfg_iface.cc b/src/lib/dhcpsrv/cfg_iface.cc
index 67125503c56c5c1baf0d8858e818d8cc7313aa34..4bdad616159ee15c9f5d76ed965a0acf3da4f3d4 100644 (file)
--- a/src/lib/dhcpsrv/cfg_iface.cc
+++ b/src/lib/dhcpsrv/cfg_iface.cc
@@ -600,7 +600,7 @@ CfgIface::merge(const CfgIface& other, const uint16_t family) {
             if ((name != ALL_IFACES_KEYWORD)) {
                 // Log that we're listening on the specific interface and that the
                 // address is not explicitly specified.
-                LOG_INFO(dhcpsrv_logger, DHCPSRV_CFGMGR_ADD_IFACE).arg(name);
+                LOG_INFO(dhcpsrv_logger, DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE).arg(name);
                 iface_set_.insert(name);
                 updated = true;
             }

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc
index 30fc1bf0b1dd9a45c471cbd945129b4068bc427c..d29e526c7f169bfe8903231b1da8c5000b683633 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.cc
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc
@@ -8,6 +8,7 @@ namespace isc {
 namespace dhcp {
 
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_IFACE = "DHCPSRV_CFGMGR_ADD_IFACE";
+extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE = "DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET4 = "DHCPSRV_CFGMGR_ADD_SUBNET4";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6 = "DHCPSRV_CFGMGR_ADD_SUBNET6";
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE = "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE";
@@ -191,6 +192,7 @@ namespace {
 
 const char* values[] = {
     "DHCPSRV_CFGMGR_ADD_IFACE", "listening on interface %1",
+    "DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE", "listening on interface %1",
     "DHCPSRV_CFGMGR_ADD_SUBNET4", "adding subnet %1",
     "DHCPSRV_CFGMGR_ADD_SUBNET6", "adding subnet %1",
     "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE", "enabling listening on all interfaces",

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h
index 1e88bdaa10c238b35337292445f8cfff81586ba0..05d6b102dfd45fd3005190517b4c479a5d9a4041 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.h
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.h
@@ -9,6 +9,7 @@ namespace isc {
 namespace dhcp {
 
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_IFACE;
+extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET4;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6;
 extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE;

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index b653f27aa8fdefd7cf39d7927f294ae7627b4130..0c4f0be105194373b4b897e51aed8d7e5f141eb5 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -10,6 +10,10 @@ $NAMESPACE isc::dhcp
 An info message issued when a new interface is being added to the collection of
 interfaces on which the server listens to DHCP messages.
 
+% DHCPSRV_CFGMGR_ADD_IFACE_ON_MERGE listening on interface %1
+An info message issued when a new interface is being added to the collection of
+interfaces on which the server listens to DHCP messages.
+
 % DHCPSRV_CFGMGR_ADD_SUBNET4 adding subnet %1
 Logged at debug log level 40.
 A debug message reported when the DHCP configuration manager is adding the