summaryrefslogtreecommitdiffstats
path: root/src/lib/database
diff options
context:
space:
mode:
authorRazvan Becheriu <razvan@isc.org>2020-11-06 10:02:01 +0100
committerRazvan Becheriu <razvan@isc.org>2020-12-09 18:12:46 +0100
commit374603523d128124c7f750c50db333c692fff0d3 (patch)
tree982f197f19c3a6134f968ab598f404dc2fe3b6c0 /src/lib/database
parent[#1375] added IOService to mysql and postgresql connections (diff)
downloadkea-374603523d128124c7f750c50db333c692fff0d3.tar.xz
kea-374603523d128124c7f750c50db333c692fff0d3.zip
[#1375] removed unused IOService
Diffstat (limited to 'src/lib/database')
-rw-r--r--src/lib/database/database_connection.cc2
-rw-r--r--src/lib/database/tests/database_connection_unittest.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/database/database_connection.cc b/src/lib/database/database_connection.cc
index 6c5d427dc2..03e0f78547 100644
--- a/src/lib/database/database_connection.cc
+++ b/src/lib/database/database_connection.cc
@@ -138,7 +138,7 @@ DatabaseConnection::makeReconnectCtl(const std::string& timer_name) {
// Wasn't specified so we'll use default of 0;
}
- reconnect_ctl_ = boost::make_shared<ReconnectCtl>(timer_name, type, retries,
+ reconnect_ctl_ = boost::make_shared<ReconnectCtl>(type, timer_name, retries,
interval);
}
diff --git a/src/lib/database/tests/database_connection_unittest.cc b/src/lib/database/tests/database_connection_unittest.cc
index 7442454045..f7e26720e5 100644
--- a/src/lib/database/tests/database_connection_unittest.cc
+++ b/src/lib/database/tests/database_connection_unittest.cc
@@ -230,7 +230,6 @@ TEST_F(DatabaseConnectionCallbackTest, dbRecoveredCallback) {
ASSERT_EQ(3, db_reconnect_ctl_->maxRetries());
ASSERT_EQ(3, db_reconnect_ctl_->retriesLeft());
EXPECT_EQ(60000, db_reconnect_ctl_->retryInterval());
- ASSERT_TRUE(db_reconnect_ctl_->checkRetries());
/// Verify that checkRetries() correctly decrements
/// down to zero, and that retriesLeft() returns
@@ -294,7 +293,6 @@ TEST_F(DatabaseConnectionCallbackTest, dbFailedCallback) {
ASSERT_EQ(3, db_reconnect_ctl_->maxRetries());
ASSERT_EQ(3, db_reconnect_ctl_->retriesLeft());
EXPECT_EQ(60000, db_reconnect_ctl_->retryInterval());
- ASSERT_TRUE(db_reconnect_ctl_->checkRetries());
/// Verify that checkRetries() correctly decrements
/// down to zero, and that retriesLeft() returns