rib: keep AutoPrefixPropagator log levels symmetric
Change-Id: Iabf254706dba0ea7843495912be4154321a91993
refs: #3524
diff --git a/rib/auto-prefix-propagator.cpp b/rib/auto-prefix-propagator.cpp
index c597e82..29321b4 100644
--- a/rib/auto-prefix-propagator.cpp
+++ b/rib/auto-prefix-propagator.cpp
@@ -251,7 +251,7 @@
if (doesCurrentPropagatedPrefixWork(parameters.getName())) {
// PROPAGATED / PROPAGATE_FAIL --> PROPAGATING
entryIt->second.startPropagation();
- return startPropagation(parameters, options, retryWaitTime);
+ return advertise(parameters, options, retryWaitTime);
}
NFD_LOG_INFO("current propagated prefix does not work any more");
@@ -266,11 +266,11 @@
}
void
-AutoPrefixPropagator::startPropagation(const ControlParameters& parameters,
- const CommandOptions& options,
- time::seconds retryWaitTime)
+AutoPrefixPropagator::advertise(const ControlParameters& parameters,
+ const CommandOptions& options,
+ time::seconds retryWaitTime)
{
- NFD_LOG_TRACE("start propagate " << parameters.getName());
+ NFD_LOG_INFO("advertise " << parameters.getName());
ndn::Scheduler::Event refreshEvent =
bind(&AutoPrefixPropagator::onRefreshTimer, this, parameters, options);
@@ -287,11 +287,11 @@
}
void
-AutoPrefixPropagator::startRevocation(const ControlParameters& parameters,
- const CommandOptions& options,
- time::seconds retryWaitTime)
+AutoPrefixPropagator::withdraw(const ControlParameters& parameters,
+ const CommandOptions& options,
+ time::seconds retryWaitTime)
{
- NFD_LOG_INFO("start revoke propagation of " << parameters.getName());
+ NFD_LOG_INFO("withdraw " << parameters.getName());
m_nfdController.start<ndn::nfd::RibUnregisterCommand>(
parameters,
@@ -317,7 +317,7 @@
// NEW --> PROPAGATING
entry.startPropagation();
- startPropagation(parameters, options, m_baseRetryWait);
+ advertise(parameters, options, m_baseRetryWait);
}
void
@@ -342,7 +342,7 @@
return;
}
- startRevocation(parameters, options, m_baseRetryWait);
+ withdraw(parameters, options, m_baseRetryWait);
}
void
@@ -390,7 +390,7 @@
// propagation should be revoked if this entry has been erased (i.e., be in RELEASED state)
NFD_LOG_DEBUG("Already erased!");
ControlParameters newParameters = parameters;
- return startRevocation(newParameters.unsetCost(), options, m_baseRetryWait);
+ return withdraw(newParameters.unsetCost(), options, m_baseRetryWait);
}
// PROPAGATING --> PROPAGATED
@@ -437,7 +437,7 @@
entryIt->second.startPropagation();
ControlParameters newParameters = parameters;
- startPropagation(newParameters.setCost(m_controlParameters.getCost()), options, retryWaitTime);
+ advertise(newParameters.setCost(m_controlParameters.getCost()), options, retryWaitTime);
}
}
diff --git a/rib/auto-prefix-propagator.hpp b/rib/auto-prefix-propagator.hpp
index f61b129..bd3ef50 100644
--- a/rib/auto-prefix-propagator.hpp
+++ b/rib/auto-prefix-propagator.hpp
@@ -202,9 +202,9 @@
* @param retryWaitTime the current wait time before retrying propagation
*/
void
- startPropagation(const ndn::nfd::ControlParameters& parameters,
- const ndn::nfd::CommandOptions& options,
- time::seconds retryWaitTime);
+ advertise(const ndn::nfd::ControlParameters& parameters,
+ const ndn::nfd::CommandOptions& options,
+ time::seconds retryWaitTime);
/**
* @brief send out the unregistration command to revoke the corresponding propagation.
@@ -214,9 +214,9 @@
* @param retryWaitTime the current wait time before retrying propagation
*/
void
- startRevocation(const ndn::nfd::ControlParameters& parameters,
- const ndn::nfd::CommandOptions& options,
- time::seconds retryWaitTime);
+ withdraw(const ndn::nfd::ControlParameters& parameters,
+ const ndn::nfd::CommandOptions& options,
+ time::seconds retryWaitTime);
/**
* @brief invoked when Rib::afterInsertEntry signal is emitted
@@ -301,7 +301,7 @@
* rib.auto_prefix_propagate.refresh_interval.
*
* Otherwise, make a copy of the ControlParameters @p parameters, unset its Cost field, and then
- * invoke startRevocation with this new ControlParameters.
+ * invoke withdraw with this new ControlParameters.
*
* @param parameters the ControlParameters used by the registration command for propagation
* @param options the CommandOptions used by the registration command for propagation
@@ -341,7 +341,7 @@
*
* If the PropagatedEntry still exists and is not in PROPAGATE_FAIL state, switch it to
* PROPAGATING. Then make a copy of the ControlParameters @p parameters, reset its Cost, and
- * invoke startPropagation with this new ControlParameters.
+ * invoke advertise with this new ControlParameters.
*
* @param parameters the ControlParameters used by the unregistration command for revocation
* @param options the CommandOptions used by the unregistration command for revocation