Commit 79b5468a authored by Francis Dupont's avatar Francis Dupont

[5213] indent and untabily

parent 6221a9e2
......@@ -21,6 +21,7 @@
#include <signal.h>
using namespace isc::data;
using namespace isc::dhcp;
using namespace isc::hooks;
using namespace isc::config;
using namespace isc::stats;
......@@ -40,9 +41,11 @@ namespace {
void signalHandler(int signo) {
// SIGHUP signals a request to reconfigure the server.
if (signo == SIGHUP) {
isc::dhcp::ControlledDhcpv4Srv::processCommand("config-reload", ConstElementPtr());
ControlledDhcpv4Srv::processCommand("config-reload",
ConstElementPtr());
} else if ((signo == SIGTERM) || (signo == SIGINT)) {
isc::dhcp::ControlledDhcpv4Srv::processCommand("shutdown", ConstElementPtr());
ControlledDhcpv4Srv::processCommand("shutdown",
ConstElementPtr());
}
}
......
......@@ -926,8 +926,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
// Verify the configuration was successful.
EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration seems sane. "
"Control-socket, hook-libraries, and D2 configuration were "
"sanity checked, but not applied.\" }",
"Control-socket, hook-libraries, and D2 configuration were "
"sanity checked, but not applied.\" }",
response);
// Check that the config was not applied
......
......@@ -22,6 +22,7 @@
#include <signal.h>
using namespace isc::config;
using namespace isc::dhcp;
using namespace isc::data;
using namespace isc::hooks;
using namespace isc::stats;
......@@ -44,11 +45,11 @@ static const char* SERVER_DUID_FILE = "kea-dhcp6-serverid";
void signalHandler(int signo) {
// SIGHUP signals a request to reconfigure the server.
if (signo == SIGHUP) {
isc::dhcp::ControlledDhcpv6Srv::processCommand("config-reload",
ConstElementPtr());
ControlledDhcpv6Srv::processCommand("config-reload",
ConstElementPtr());
} else if ((signo == SIGTERM) || (signo == SIGINT)) {
isc::dhcp::ControlledDhcpv6Srv::processCommand("shutdown",
ConstElementPtr());
ControlledDhcpv6Srv::processCommand("shutdown",
ConstElementPtr());
}
}
......
......@@ -650,8 +650,8 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
// Verify the configuration was successful.
EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration seems sane. "
"Control-socket, hook-libraries, and D2 configuration were "
"sanity checked, but not applied.\" }",
"Control-socket, hook-libraries, and D2 configuration were "
"sanity checked, but not applied.\" }",
response);
// Check that the config was not applied.
......
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