[#1369] More review fixes.

diff --git a/ChangeLog b/ChangeLog
index 74b226522fb6825c92bda6ecd25ab1d08d58d9a6..b1608419194a58b69ceab059562e9c094a79bc76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 1782.  [bug]           tmark
        Corrected a bug that causes kea-dhcp4/kea-dhcp6 servers to crash after
-       losing connectivity to a configuration backend database.  The servers
+       losing connectivity to a configuration backend database. The servers
        now correctly honor the max-reconnect-tries parameter.
        (Gitlab #1369)
 

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index 5741a94fd84d24097245a5b61c2cd0c3cda8a5d2..adfb2cef7a6622f08ae11c5830a3eb3dfcb3971b 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -1136,7 +1136,7 @@ void
 ControlledDhcpv4Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     bool reopened = false;
 
-    // We lost at least one of them, Reopen all of them (lease, host, and CB databases).
+    // We lost at least one of them. Reopen all of them (lease, host, and CB databases).
     try {
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getCurrentCfg()->getCfgDbAccess();
         cfg_db->createManagers();

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index f89da13a0da8dc7f3e44bea1dd09c6c316f31eb1..faf115a913617a3fde9abc9dd9e21d4fb7483dd6 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -1155,7 +1155,7 @@ void
 ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
     bool reopened = false;
 
-    // We lost at least one of them, Reopen all of them (lease, host, and CB databases)
+    // We lost at least one of them. Reopen all of them (lease, host, and CB databases).
     try {
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getCurrentCfg()->getCfgDbAccess();
         cfg_db->createManagers();

diff --git a/src/lib/database/database_connection.h b/src/lib/database/database_connection.h
index 773554d716e220f954b5e5035f5579b7db4bb62d..c49be14e67de1bd8555f98fe048ebc43e4e90dde 100644 (file)
--- a/src/lib/database/database_connection.h
+++ b/src/lib/database/database_connection.h
@@ -250,6 +250,7 @@ public:
     static DbLostCallback db_lost_callback;
 
     /// @brief Throws an exception if the connection is not usable.
+    /// @throw DbConnectionUnusable
     void checkUnusable() {
         if (unusable_)  {
             isc_throw (DbConnectionUnusable, "Attempt to use an invalid connection");
@@ -257,8 +258,7 @@ public:
     }
 
 protected:
-    /// @brief Sets the usable flag to the given value.
-    /// @param usable new value for the flag.
+    /// @brief Sets the unusable flag to true.
     void markUnusable() { unusable_ = true; }
 
 private:
@@ -272,10 +272,10 @@ private:
 
     /// @brief Indicates if the connection can no longer be used for normal
     /// operations. Typically a connection is marked unusable after an unrecoverable
-    /// DB error.  There may be a time during which the connection exists after
+    /// DB error. There may be a time during which the connection exists after
     /// such an every during which it cannot be used for anything beyond checking
-    /// parameters and error information.  This flag can be used as a guard in
-    /// code to prevent inadvertant use of a broken connection.
+    /// parameters and error information. This flag can be used as a guard in
+    /// code to prevent inadvertent use of a broken connection.
     bool unusable_;
 };