mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[5213] Some cosmetic fixes

Browse Source
This commit is contained in:
Francis Dupont
2017-04-18 09:52:23 +02:00
parent 79b5468afa
commit 497f225b55
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -441,7 +441,7 @@ ControlledDhcpv4Srv::commandLeasesReclaimHandler(const string&,
ConstElementPtr ConstElementPtr
ControlledDhcpv4Srv::processCommand(const string& command, ControlledDhcpv4Srv::processCommand(const string& command,
ConstElementPtr args) { ConstElementPtr args) {
string txt = args? args->str() : "(none)"; string txt = args ? args->str() : "(none)";
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_COMMAND, DHCP4_COMMAND_RECEIVED) LOG_DEBUG(dhcp4_logger, DBG_DHCP4_COMMAND, DHCP4_COMMAND_RECEIVED)
.arg(command).arg(txt); .arg(command).arg(txt);

2
src/bin/dhcp4/ctrl_dhcp4_srv.h
View File

@@ -40,7 +40,7 @@ public:
/// This method may throw if initialization fails. /// This method may throw if initialization fails.
void init(const std::string& config_file); void init(const std::string& config_file);
/// @brief loads specific config file /// @brief Loads specific config file
/// ///
/// This utility method is called whenever we know a filename of the config /// This utility method is called whenever we know a filename of the config
/// and need to load it. It calls config-set command once the content of /// and need to load it. It calls config-set command once the content of

5
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -69,6 +69,7 @@ ControlledDhcpv6Srv* ControlledDhcpv6Srv::server_ = NULL;
/// the JSON configuration file. /// the JSON configuration file.
/// ///
/// @param file_name Configuration file location. /// @param file_name Configuration file location.
/// @return status of the command
ConstElementPtr ConstElementPtr
ControlledDhcpv6Srv::loadConfigFile(const std::string& file_name) { ControlledDhcpv6Srv::loadConfigFile(const std::string& file_name) {
// This is a configuration backend implementation that reads the // This is a configuration backend implementation that reads the
@@ -154,7 +155,7 @@ ControlledDhcpv6Srv::init(const std::string& file_name) {
// We don't need to call openActiveSockets() or startD2() as these // We don't need to call openActiveSockets() or startD2() as these
// methods are called in processConfig() which is called by // methods are called in processConfig() which is called by
// processCommand("reload-config", ...) // processCommand("config-set", ...)
// Set signal handlers. When the SIGHUP is received by the process // Set signal handlers. When the SIGHUP is received by the process
// the server reconfiguration will be triggered. When SIGTERM or // the server reconfiguration will be triggered. When SIGTERM or
@@ -442,7 +443,7 @@ ControlledDhcpv6Srv::commandLeasesReclaimHandler(const string&,
isc::data::ConstElementPtr isc::data::ConstElementPtr
ControlledDhcpv6Srv::processCommand(const std::string& command, ControlledDhcpv6Srv::processCommand(const std::string& command,
isc::data::ConstElementPtr args) { isc::data::ConstElementPtr args) {
string txt = args? args->str() : "(none)"; string txt = args ? args->str() : "(none)";
LOG_DEBUG(dhcp6_logger, DBG_DHCP6_COMMAND, DHCP6_COMMAND_RECEIVED) LOG_DEBUG(dhcp6_logger, DBG_DHCP6_COMMAND, DHCP6_COMMAND_RECEIVED)
.arg(command).arg(txt); .arg(command).arg(txt);

2
src/bin/dhcp6/ctrl_dhcp6_srv.h
View File

@@ -40,7 +40,7 @@ public:
/// This method may throw if initialization fails. /// This method may throw if initialization fails.
void init(const std::string& config_file); void init(const std::string& config_file);
/// @brief loads specific configuration file /// @brief Loads specific configuration file
/// ///
/// This utility method is called whenever we know a filename of the config /// This utility method is called whenever we know a filename of the config
/// and need to load it. It calls config-set command once the content of /// and need to load it. It calls config-set command once the content of