summaryrefslogtreecommitdiffstats
path: root/src/bin/d2/d2_update_mgr.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/d2/d2_update_mgr.cc')
-rw-r--r--src/bin/d2/d2_update_mgr.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/bin/d2/d2_update_mgr.cc b/src/bin/d2/d2_update_mgr.cc
index 708d9a6438..322dd1f31e 100644
--- a/src/bin/d2/d2_update_mgr.cc
+++ b/src/bin/d2/d2_update_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -56,7 +56,7 @@ void D2UpdateMgr::sweep() {
// frequently. It will likely achieve max transactions quickly on its own.
if (getQueueCount() > 0) {
if (getTransactionCount() >= max_transactions_) {
- LOG_DEBUG(dhcp_to_d2_logger, DBGLVL_TRACE_DETAIL_DATA,
+ LOG_DEBUG(dhcp_to_d2_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
DHCP_DDNS_AT_MAX_TRANSACTIONS).arg(getQueueCount())
.arg(getMaxTransactions());
@@ -82,7 +82,7 @@ D2UpdateMgr::checkFinishedTransactions() {
while (it != transaction_list_.end()) {
NameChangeTransactionPtr trans = (*it).second;
if (trans->isModelDone()) {
- // @todo Addtional actions based on NCR status could be
+ // @todo Additional actions based on NCR status could be
// performed here.
transaction_list_.erase(it++);
} else {
@@ -110,8 +110,9 @@ void D2UpdateMgr::pickNextJob() {
// There were no eligible jobs. All of the current DHCIDs already have
// transactions pending.
- LOG_DEBUG(dhcp_to_d2_logger, DBGLVL_TRACE_DETAIL_DATA, DHCP_DDNS_NO_ELIGIBLE_JOBS)
- .arg(getQueueCount()).arg(getTransactionCount());
+ LOG_DEBUG(dhcp_to_d2_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
+ DHCP_DDNS_NO_ELIGIBLE_JOBS)
+ .arg(getQueueCount()).arg(getTransactionCount());
}
void
@@ -132,7 +133,7 @@ D2UpdateMgr::makeTransaction(dhcp_ddns::NameChangeRequestPtr& next_ncr) {
if (next_ncr->isForwardChange()) {
if (!cfg_mgr_->forwardUpdatesEnabled()) {
next_ncr->setForwardChange(false);
- LOG_DEBUG(dhcp_to_d2_logger, DBGLVL_TRACE_DETAIL_DATA,
+ LOG_DEBUG(dhcp_to_d2_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
DHCP_DDNS_FWD_REQUEST_IGNORED)
.arg(next_ncr->getRequestId())
.arg(next_ncr->toText());
@@ -158,7 +159,7 @@ D2UpdateMgr::makeTransaction(dhcp_ddns::NameChangeRequestPtr& next_ncr) {
if (next_ncr->isReverseChange()) {
if (!cfg_mgr_->reverseUpdatesEnabled()) {
next_ncr->setReverseChange(false);
- LOG_DEBUG(dhcp_to_d2_logger, DBGLVL_TRACE_DETAIL_DATA,
+ LOG_DEBUG(dhcp_to_d2_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
DHCP_DDNS_REV_REQUEST_IGNORED)
.arg(next_ncr->getRequestId())
.arg(next_ncr->toText());
@@ -182,7 +183,7 @@ D2UpdateMgr::makeTransaction(dhcp_ddns::NameChangeRequestPtr& next_ncr) {
// If there is nothing to actually do, then the request falls on the floor.
// Should we log this?
if (!direction_count) {
- LOG_DEBUG(dhcp_to_d2_logger, DBGLVL_TRACE_DETAIL_DATA,
+ LOG_DEBUG(dhcp_to_d2_logger, isc::log::DBGLVL_TRACE_DETAIL_DATA,
DHCP_DDNS_REQUEST_DROPPED)
.arg(next_ncr->getRequestId())
.arg(next_ncr->toText());