Commit 031ae7d0 authored by Thomas Markwalder's avatar Thomas Markwalder

[2956] Addtional review corrections.

parent 21f3ea90
......@@ -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
......
......@@ -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>
......
......@@ -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));
}
......
......@@ -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;
......
......@@ -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_);
}
......
......@@ -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_);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment