BIND 10 trac2956, updated. 031ae7d0a205b4a82593ba4767e8e4741b3f8081 [2956] Addtional review corrections.
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 6 16:13:38 UTC 2013
The branch, trac2956 has been updated
via 031ae7d0a205b4a82593ba4767e8e4741b3f8081 (commit)
from 21f3ea90672b5bf84886e58f08f97bbcc63dfd6d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 031ae7d0a205b4a82593ba4767e8e4741b3f8081
Author: Thomas Markwalder <tmark at isc.org>
Date: Thu Jun 6 12:12:36 2013 -0400
[2956] Addtional review corrections.
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/Makefile.am | 2 +-
src/bin/d2/b10-dhcp-ddns.xml | 10 +++++++---
src/bin/d2/d2_process.cc | 4 ++--
src/bin/d2/d_controller.cc | 14 +++++++-------
src/bin/d2/d_controller.h | 4 ++--
src/bin/d2/d_process.h | 2 +-
6 files changed, 20 insertions(+), 16 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 97bc249..7cf3019 100644
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -26,7 +26,7 @@ if GENERATE_DOCS
b10-dhcp-ddns.8: b10-dhcp-ddns.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
- $(srcdir)/b10-dchdp-ddns.xml
+ $(srcdir)/b10-dhcp-ddns.xml
else
diff --git a/src/bin/d2/b10-dhcp-ddns.xml b/src/bin/d2/b10-dhcp-ddns.xml
index 7867d1b..b77ff17 100644
--- a/src/bin/d2/b10-dhcp-ddns.xml
+++ b/src/bin/d2/b10-dhcp-ddns.xml
@@ -31,7 +31,7 @@
<refnamediv>
<refname>b10-dhcp-ddns</refname>
- <refpurpose>D2 process in BIND 10 architecture</refpurpose>
+ <refpurpose>DHCP-DDNS process in BIND 10 architecture</refpurpose>
</refnamediv>
<docinfo>
@@ -59,8 +59,12 @@
<refsect1>
<title>DESCRIPTION</title>
<para>
- The <command>b10-dhcp-ddns</command> daemon processes requests to
- to update DNS mapping based on DHCP lease change events.
+ The <command>b10-dhcp-ddns</command> service processes requests to
+ to update DNS mapping based on DHCP lease change events. The service
+ may run either as a BIND10 module (integrated mode) or as a individual
+ process (stand-alone mode) dependent upon command line arguments. The
+ default is integrated mode. Stand alone operation is strictly for
+ development purposes and is not suited for production.
</para>
</refsect1>
diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index 293fece..64eea72 100644
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -45,7 +45,7 @@ D2Process::run() {
} catch (const std::exception& ex) {
LOG_FATAL(d2_logger, D2PRC_FAILED).arg(ex.what());
isc_throw (DProcessBaseError,
- "Process run method failed:" << ex.what());
+ "Process run method failed: " << ex.what());
}
}
@@ -78,7 +78,7 @@ D2Process::command(const std::string& command, isc::data::ConstElementPtr args){
LOG_DEBUG(d2_logger, DBGLVL_TRACE_BASIC,
D2PRC_COMMAND).arg(command).arg(args->str());
- return (isc::config::createAnswer(COMMAND_INVALID, "Unrecognized command:"
+ return (isc::config::createAnswer(COMMAND_INVALID, "Unrecognized command: "
+ command));
}
diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index e2bf06c..2487f2d 100644
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -67,7 +67,7 @@ DControllerBase::launch(int argc, char* argv[]) {
} catch (const std::exception& ex) {
LOG_FATAL(d2_logger, D2CTL_INIT_PROCESS).arg(ex.what());
isc_throw (ProcessInitError,
- "Application Process initialization failed:" << ex.what());
+ "Application Process initialization failed: " << ex.what());
}
// Next we connect if we are running integrated.
@@ -79,7 +79,7 @@ DControllerBase::launch(int argc, char* argv[]) {
} catch (const std::exception& ex) {
LOG_FATAL(d2_logger, D2CTL_SESSION_FAIL).arg(ex.what());
isc_throw (SessionStartError,
- "Session start up failed:" << ex.what());
+ "Session start up failed: " << ex.what());
}
}
@@ -90,7 +90,7 @@ DControllerBase::launch(int argc, char* argv[]) {
} catch (const std::exception& ex) {
LOG_FATAL(d2_logger, D2CTL_FAILED).arg(ex.what());
isc_throw (ProcessRunError,
- "Application process event loop failed:" << ex.what());
+ "Application process event loop failed: " << ex.what());
}
// If running integrated, disconnect.
@@ -99,7 +99,7 @@ DControllerBase::launch(int argc, char* argv[]) {
disconnectSession();
} catch (const std::exception& ex) {
LOG_ERROR(d2_logger, D2CTL_DISCONNECT_FAIL).arg(ex.what());
- isc_throw (SessionEndError, "Session end failed:" << ex.what());
+ isc_throw (SessionEndError, "Session end failed: " << ex.what());
}
}
@@ -172,7 +172,7 @@ DControllerBase::initProcess() {
try {
process_.reset(createProcess());
} catch (const std::exception& ex) {
- isc_throw(DControllerBaseError, std::string("createProcess failed:")
+ isc_throw(DControllerBaseError, std::string("createProcess failed: ")
+ ex.what());
}
@@ -389,7 +389,7 @@ DControllerBase::customControllerCommand(const std::string& command,
// Default implementation always returns invalid command.
return (isc::config::createAnswer(COMMAND_INVALID,
- "Unrecognized command:" + command));
+ "Unrecognized command: " + command));
}
isc::data::ConstElementPtr
@@ -409,7 +409,7 @@ void
DControllerBase::usage(const std::string & text)
{
if (text != "") {
- std::cerr << "Usage error:" << text << std::endl;
+ std::cerr << "Usage error: " << text << std::endl;
}
std::cerr << "Usage: " << name_ << std::endl;
diff --git a/src/bin/d2/d_controller.h b/src/bin/d2/d_controller.h
index 8d3094e..52a284d 100644
--- a/src/bin/d2/d_controller.h
+++ b/src/bin/d2/d_controller.h
@@ -344,7 +344,7 @@ protected:
/// @brief Supplies whether or not the controller is in stand alone mode.
///
/// @return returns true if in stand alone mode, false otherwise
- const bool isStandAlone() const {
+ bool isStandAlone() {
return (stand_alone_);
}
@@ -358,7 +358,7 @@ protected:
/// @brief Supplies whether or not verbose logging is enabled.
///
/// @return returns true if verbose logging is enabled.
- const bool isVerbose() const {
+ bool isVerbose() {
return (verbose_);
}
diff --git a/src/bin/d2/d_process.h b/src/bin/d2/d_process.h
index 018af63..8011191 100644
--- a/src/bin/d2/d_process.h
+++ b/src/bin/d2/d_process.h
@@ -127,7 +127,7 @@ public:
/// @brief Checks if the process has been instructed to shut down.
///
/// @return returns true if process shutdown flag is true.
- const bool shouldShutdown() const {
+ bool shouldShutdown() {
return (shut_down_flag_);
}
More information about the bind10-changes
mailing list