[#101,!73] Addressed missed review items

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index d41ee87bc948db21755549d1a5fd5f4e07250525..2c2d341001f0d71abc05f1b36f0fefb6d1491edb 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -11,11 +11,6 @@ This message is printed when DHCPv4 server enabled an interface to be used
 to receive DHCPv4 traffic. IPv4 socket on this interface will be opened once
 Interface Manager starts up procedure of opening sockets.
 
-% DHCP4_ADDING_CONFIG_DB Opening configuration database: %1
-This message is printed when the DHCPv4 server is attempting to open a
-configuration database.  The database access string with password redacted
-is logged.
-
 % DHCP4_ALREADY_RUNNING %1 already running? %2
 This is an error message that occurs when the DHCPv4 server encounters
 a pre-existing PID file which contains the PID of a running process.
@@ -416,6 +411,11 @@ This warning message is issued when current server configuration specifies
 no interfaces that server should listen on, or specified interfaces are not
 configured to receive the traffic.
 
+% DHCP4_OPEN_CONFIG_DB Opening configuration database: %1
+This message is printed when the DHCPv4 server is attempting to open a
+configuration database.  The database access string with password redacted
+is logged.
+
 % DHCP4_OPEN_SOCKET opening sockets on port %1
 A debug message issued during startup, this indicates that the DHCPv4
 server is about to open sockets on the specified port.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 910810db103dbdb6ee72e4f2dfbdf06389ddfbb4..654a0c4f68b4e5a1e755621ecd652fa547b1c6a1 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -645,7 +645,7 @@ bool databaseConfigConnect(const SrvConfigPtr& srv_cfg) {
 
     // Iterate over the configured DBs and instantiate them.
     for (auto db : config_ctl->getConfigDatabases()) {
-        LOG_INFO(dhcp4_logger, DHCP4_ADDING_CONFIG_DB)
+        LOG_INFO(dhcp4_logger, DHCP4_OPEN_CONFIG_DB)
                  .arg(db.redactedAccessString());
         mgr.addBackend(db.getAccessString());
     }

diff --git a/src/bin/dhcp4/json_config_parser.h b/src/bin/dhcp4/json_config_parser.h
index b03cd2d1636f57fab1dd54f4201c4148862e7e89..7dc712385b29ef4b4ba3a232498f54144738e413 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.h
+++ b/src/bin/dhcp4/json_config_parser.h
@@ -86,7 +86,7 @@ databaseConfigConnect(const SrvConfigPtr& srv_cfg);
 /// @param srv_cfg Server configuration into which database configuration should be merged
 /// @param mutable_cfg parsed configuration from the configuration file plus default values
 void
-databaseConfigFetch(const SrvConfigPtr& srv_cfg, isc::data::ElementPtr /*mutable_scope*/);
+databaseConfigFetch(const SrvConfigPtr& srv_cfg, isc::data::ElementPtr /* mutable_cfg */);
 
 }; // end of isc::dhcp namespace
 }; // end of isc namespace

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h
index 03e6b5fa1a2a2690355f1a8f0859e7b30e5f5eb8..44f95dca90b450ddf9d6ac6ffac2aea9b9b85901 100644 (file)
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.h
@@ -20,7 +20,7 @@ namespace isc {
 namespace dhcp {
 namespace test {
 
-/// @brief Test backend for that implements all of the DHCPv4 API calls
+/// @brief Test backend that implements all of the DHCPv4 API calls
 ///
 /// Currently all API get calls which return a single entry, will return an
 /// empty pointer of appropriate type. API calls which return a collection of