From: Francis Dupont <fdupont@isc.org>
Date: Sun, 25 Mar 2018 17:00:54 +0000 (+0200)
Subject: [5574] backend name -> type
X-Git-Tag: trac5577_base~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf66cc04b924d1bc08606fcf67bcb18357af978a;p=thirdparty%2Fkea.git

[5574] backend name -> type
---

diff --git a/src/lib/dhcpsrv/database_connection.cc b/src/lib/dhcpsrv/database_connection.cc
index e82ffea2f9..6363492b17 100644
--- a/src/lib/dhcpsrv/database_connection.cc
+++ b/src/lib/dhcpsrv/database_connection.cc
@@ -111,13 +111,13 @@ DatabaseConnection::configuredReadOnly() const {
 ReconnectCtlPtr
 DatabaseConnection::makeReconnectCtl() const {
     ReconnectCtlPtr retry;
-    string name = "unknown";
+    string type = "unknown";
     unsigned int retries = 0;
     unsigned int interval = 0;
 
     // Assumes that parsing ensurse only valid values are present
     try {
-        name = getParameter("type");
+        type = getParameter("type");
     } catch (...) {
         // Wasn't specified so we'll use default of "unknown".
     }
@@ -137,7 +137,7 @@ DatabaseConnection::makeReconnectCtl() const {
         // Wasn't specified so we'll use default of 0;
     }
 
-    retry.reset(new ReconnectCtl(name, retries, interval));
+    retry.reset(new ReconnectCtl(type, retries, interval));
     return (retry);
 }
 
diff --git a/src/lib/dhcpsrv/database_connection.h b/src/lib/dhcpsrv/database_connection.h
index 5aa0d1cec4..8dcbe56115 100644
--- a/src/lib/dhcpsrv/database_connection.h
+++ b/src/lib/dhcpsrv/database_connection.h
@@ -75,17 +75,17 @@ public:
 class ReconnectCtl {
 public:
     /// @brief Constructor
-    /// @param backend_name name of the caller backend.
+    /// @param backend_type type of the caller backend.
     /// @param max_retries maximum number of reconnect attempts to make
     /// @param retry_interval amount of time to between reconnect attempts
-    ReconnectCtl(const std::string& backend_name, unsigned int max_retries,
+    ReconnectCtl(const std::string& backend_type, unsigned int max_retries,
                  unsigned int retry_interval)
-        : backend_name_(backend_name), max_retries_(max_retries),
+        : backend_type_(backend_type), max_retries_(max_retries),
           retries_left_(max_retries), retry_interval_(retry_interval) {}
 
-    /// @brief Returns the name of the caller backend.
-    std::string backendName() const {
-        return (backend_name_);
+    /// @brief Returns the type of the caller backend.
+    std::string backendType() const {
+        return (backend_type_);
     }
 
     /// @brief Decrements the number of retries remaining
@@ -112,8 +112,8 @@ public:
     }
 
 private:
-    /// @brief Caller backend name.
-    const std::string backend_name_;
+    /// @brief Caller backend type.
+    const std::string backend_type_;
 
     /// @brief Maximum number of retry attempts to make
     unsigned int max_retries_;
diff --git a/src/lib/dhcpsrv/tests/database_connection_unittest.cc b/src/lib/dhcpsrv/tests/database_connection_unittest.cc
index 0f6413ecb0..0836610828 100644
--- a/src/lib/dhcpsrv/tests/database_connection_unittest.cc
+++ b/src/lib/dhcpsrv/tests/database_connection_unittest.cc
@@ -97,7 +97,7 @@ TEST_F(DatabaseConnectionCallbackTest, dbLostCallback) {
     ASSERT_NO_THROW(ret = datasrc.invokeDbLostCallback());
     EXPECT_TRUE(ret);
     ASSERT_TRUE(db_reconnect_ctl_);
-    ASSERT_EQ("test", db_reconnect_ctl_->backendName());
+    ASSERT_EQ("test", db_reconnect_ctl_->backendType());
     ASSERT_EQ(3, db_reconnect_ctl_->maxRetries());
     ASSERT_EQ(3, db_reconnect_ctl_->retriesLeft());
     EXPECT_EQ(60, db_reconnect_ctl_->retryInterval());