[#3710] addressed review comments

Author: Razvan Becheriu

src/lib/dhcpsrv/legal_log_mgr_factory.cc

@@ -118,6 +118,24 @@ LegalLogMgrFactory::addBackend(DatabaseConnection::ParameterMap& parameters, Man
     pool_[id] = pair<DatabaseConnection::ParameterMap, LegalLogMgrPtr>(parameters, backend);
 }
 
+void
+LegalLogMgrFactory::delAllBackends() {
+    pool_.clear();
+}
+
+void
+LegalLogMgrFactory::delAllBackends(const std::string& db_type) {
+    auto it = pool_.begin();
+
+    while (it != pool_.end()) {
+        if (it->second.second && it->second.second->getType() == db_type) {
+            it = pool_.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
 LegalLogMgrPtr&
 LegalLogMgrFactory::instance(ManagerID id) {
     auto it = pool_.find(id);
@@ -234,6 +252,16 @@ LegalLogMgrFactory::getDBVersions() {
     return (result);
 }
 
+bool
+LegalLogMgrFactory::haveInstance(std::string type) {
+    for (auto const& backend : pool_) {
+        if (backend.second.second && backend.second.second->getType() == type) {
+            return (true);
+        }
+    }
+    return (false);
+}
+
 } // end of namespace isc::dhcp
 } // end of namespace isc
 

src/lib/dhcpsrv/legal_log_mgr_factory.h

@@ -87,9 +87,12 @@ class LegalLogMgrFactory : public boost::noncopyable {
     static void addBackend(db::DatabaseConnection::ParameterMap& parameters, ManagerID id = 0);
 
     /// @brief Removes all backends from the pool.
-    static void delAllBackends() {
-        pool_.clear();
-    }
+    static void delAllBackends();
+
+    /// @brief Deletes all backends of the given type from the pool.
+    ///
+    /// @param db_type backend to remove.
+    static void delAllBackends(const std::string& db_type);
 
     /// @brief Returns the forensic backend manager with specified ID.
     ///
@@ -98,21 +101,6 @@ class LegalLogMgrFactory : public boost::noncopyable {
     /// @return the forensic backend manager instance or null pointer.
     static LegalLogMgrPtr& instance(ManagerID id = 0);
 
-    /// @brief Deletes all backends of the given type from the pool.
-    ///
-    /// @param db_type backend to remove.
-    static void delAllBackends(const std::string& db_type) {
-        auto it = pool_.begin();
-
-        while (it != pool_.end()) {
-            if (it->second.second && it->second.second->getType() == db_type) {
-                it = pool_.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-
     /// @brief Sets the forensic backend manager parameters.
     ///
     /// @param parameters database parameters.
@@ -182,14 +170,7 @@ class LegalLogMgrFactory : public boost::noncopyable {
     /// @brief Returns true is respective backend store is present, false otherwise.
     ///
     /// @param type the backend store type to check if it exists.
-    static bool haveInstance(std::string type) {
-        for (auto const& backend : pool_) {
-            if (backend.second.second && backend.second.second->getType() == type) {
-                return (true);
-            }
-        }
-        return (false);
-    }
+    static bool haveInstance(std::string type);
 
     /// @brief Get the hook I/O service.
     ///

src/lib/mysql/mysql_connection.cc

@@ -282,12 +282,13 @@ MySqlConnection::openDatabase() {
     MYSQL* status = mysql_real_connect(mysql_, host, user, password, name,
                                        port, NULL, CLIENT_FOUND_ROWS);
     if (status != mysql_) {
+        // Mark this connection as no longer usable.
+        markUnusable();
+
         std::string error_message = mysql_error(mysql_);
 
         auto const& rec = reconnectCtl();
         if (rec && DatabaseConnection::retry_) {
-            // Mark this connection as no longer usable.
-            markUnusable();
 
             // Start the connection recovery.
             startRecoverDbConnection();

src/lib/pgsql/pgsql_connection.cc

@@ -414,15 +414,16 @@ PgSqlConnection::openDatabaseInternal(bool logging) {
     }
 
     if (PQstatus(new_conn) != CONNECTION_OK) {
+        // Mark this connection as no longer usable.
+        markUnusable();
+
         // If we have a connection object, we have to call finish
         // to release it, but grab the error message first.
         std::string error_message = PQerrorMessage(new_conn);
         PQfinish(new_conn);
 
         auto const& rec = reconnectCtl();
         if (rec && DatabaseConnection::retry_) {
-            // Mark this connection as no longer usable.
-            markUnusable();
 
             // Start the connection recovery.
             startRecoverDbConnection();