Skip to content

GitLab

Kea
Kea
Commit 91e39181 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files
Options

[5074] Created libkea-process library.

parent 7173ec3c
Hide whitespace changes
Inline Side-by-side
Showing with 442 additions and 219 deletions
configure.ac
View file @ 91e39181
......@@ -1498,7 +1498,6 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/Makefile
src/bin/Makefile
src/bin/d2/Makefile
src/bin/d2/spec_config.h.pre
src/bin/d2/tests/Makefile
src/bin/d2/tests/d2_process_tests.sh
src/bin/d2/tests/test_data_files_config.h
......@@ -1585,6 +1584,10 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/lib/log/tests/logger_lock_test.sh
src/lib/log/tests/severity_test.sh
src/lib/log/tests/tempdir.h
src/lib/process/Makefile
src/lib/process/spec_config.h.pre
src/lib/process/tests/Makefile
src/lib/process/testutils/Makefile
src/lib/testutils/Makefile
src/lib/testutils/dhcp_test_lib.sh
src/lib/stats/Makefile
......
src/bin/d2/.gitignore
View file @ 91e39181
......@@ -2,6 +2,4 @@
/kea-dhcp-ddns.8
/d2_messages.cc
/d2_messages.h
/spec_config.h
/spec_config.h.pre
/s-messages
src/bin/d2/Makefile.am
View file @ 91e39181
......@@ -19,7 +19,7 @@ if USE_STATIC_LINK
AM_LDFLAGS = -static
endif
CLEANFILES = *.gcno *.gcda spec_config.h d2_messages.h d2_messages.cc s-messages
CLEANFILES = *.gcno *.gcda d2_messages.h d2_messages.cc s-messages
man_MANS = kea-dhcp-ddns.8
DISTCLEANFILES = $(man_MANS)
......@@ -47,25 +47,19 @@ $(man_MANS):
endif
spec_config.h: spec_config.h.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
d2_messages.h d2_messages.cc: s-messages
s-messages: d2_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/d2/d2_messages.mes
touch $@
BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
BUILT_SOURCES = d2_messages.h d2_messages.cc
# convenience archive
noinst_LTLIBRARIES = libd2.la
libd2_la_SOURCES =
libd2_la_SOURCES += d_process.h
libd2_la_SOURCES += d_controller.cc d_controller.h
libd2_la_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
libd2_la_SOURCES += d2_log.cc d2_log.h
libd2_la_SOURCES += d2_process.cc d2_process.h
libd2_la_SOURCES += d2_config.cc d2_config.h
......@@ -75,13 +69,11 @@ libd2_la_SOURCES += d2_update_message.cc d2_update_message.h
libd2_la_SOURCES += d2_update_mgr.cc d2_update_mgr.h
libd2_la_SOURCES += d2_zone.cc d2_zone.h
libd2_la_SOURCES += dns_client.cc dns_client.h
libd2_la_SOURCES += io_service_signal.cc io_service_signal.h
libd2_la_SOURCES += labeled_value.cc labeled_value.h
libd2_la_SOURCES += nc_add.cc nc_add.h
libd2_la_SOURCES += nc_remove.cc nc_remove.h
libd2_la_SOURCES += nc_trans.cc nc_trans.h
libd2_la_SOURCES += state_model.cc state_model.h
libd2_la_SOURCES += d2_controller.cc d2_controller.h
nodist_libd2_la_SOURCES = d2_messages.h d2_messages.cc
......@@ -93,6 +85,7 @@ kea_dhcp_ddns_SOURCES = main.cc
kea_dhcp_ddns_LDADD = libd2.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
......
src/bin/d2/d2_cfg_mgr.h
View file @ 91e39181
// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -10,8 +10,8 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <exceptions/exceptions.h>
#include <d2/d_cfg_mgr.h>
#include <d2/d2_config.h>
#include <process/d_cfg_mgr.h>
#include <stdint.h>
#include <string>
......
src/bin/d2/d2_config.h
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -9,10 +9,10 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <d2/d_cfg_mgr.h>
#include <dhcpsrv/parsers/dhcp_parsers.h>
#include <dns/tsig.h>
#include <exceptions/exceptions.h>
#include <process/d_cfg_mgr.h>
#include <boost/foreach.hpp>
......
src/bin/d2/d2_controller.cc
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -8,7 +8,7 @@
#include <d2/d2_controller.h>
#include <d2/d2_process.h>
#include <d2/spec_config.h>
#include <process/spec_config.h>
#include <stdlib.h>
......
src/bin/d2/d2_controller.h
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -7,7 +7,7 @@
#ifndef D2_CONTROLLER_H
#define D2_CONTROLLER_H
#include <d2/d_controller.h>
#include <process/d_controller.h>
namespace isc {
namespace d2 {
......
src/bin/d2/d2_messages.mes
View file @ 91e39181
# Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -6,83 +6,6 @@
$NAMESPACE isc::d2
% DCTL_CCSESSION_ENDING %1 ending control channel session
This debug message is issued just before the controller attempts
to disconnect from its session with the Kea control channel.
% DCTL_CCSESSION_STARTING %1 starting control channel session, specfile: %2
This debug message is issued just before the controller attempts
to establish a session with the Kea control channel.
% DCTL_COMMAND_RECEIVED %1 received command: %2, arguments: %3
A debug message listing the command (and possible arguments) received
from the Kea control system by the controller.
% DCTL_CONFIG_COMPLETE server has completed configuration: %1
This is an informational message announcing the successful processing of a
new configuration. It is output during server startup, and when an updated
configuration is committed by the administrator. Additional information
may be provided.
% DCTL_CONFIG_FILE_LOAD_FAIL %1 reason: %2
This fatal error message indicates that the application attempted to load its
initial configuration from file and has failed. The service will exit.
% DCTL_CONFIG_LOAD_FAIL %1 configuration failed to load: %2
This critical error message indicates that the initial application
configuration has failed. The service will start, but will not
process requests until the configuration has been corrected.
% DCTL_CONFIG_START parsing new configuration: %1
A debug message indicating that the application process has received an
updated configuration and has passed it to its configuration manager
for parsing.
% DCTL_CONFIG_STUB %1 configuration stub handler called
This debug message is issued when the dummy handler for configuration
events is called. This only happens during initial startup.
% DCTL_CONFIG_UPDATE %1 updated configuration received: %2
A debug message indicating that the controller has received an
updated configuration from the Kea configuration system.
% DCTL_INIT_PROCESS %1 initializing the application
This debug message is issued just before the controller attempts
to create and initialize its application instance.
% DCTL_INIT_PROCESS_FAIL %1 application initialization failed: %2
This error message is issued if the controller could not initialize the
application and will exit.
% DCTL_NOT_RUNNING %1 application instance is not running
A warning message is issued when an attempt is made to shut down the
application when it is not running.
% DCTL_PARSER_FAIL : %1
On receipt of a new configuration, the server failed to create a parser to
decode the contents of the named configuration element, or the creation
succeeded but the parsing actions and committal of changes failed.
The reason for the failure is given in the message.
% DCTL_PROCESS_FAILED %1 application execution failed: %2
The controller has encountered a fatal error while running the
application and is terminating. The reason for the failure is
included in the message.
% DCTL_RUN_PROCESS %1 starting application event loop
This debug message is issued just before the controller invokes
the application run method.
% DCTL_SESSION_FAIL %1 controller failed to establish Kea session: %1
The controller has failed to establish communication with the rest of
Kea and will exit.
% DCTL_STANDALONE %1 skipping message queue, running standalone
This is a debug message indicating that the controller is running in the
application in standalone mode. This means it will not connected to the Kea
message queue. Standalone mode is only useful during program development,
and should not be used in a production environment.
% DHCP_DDNS_ADD_FAILED DHCP_DDNS Request ID %1: Transaction outcome %2
This is an error message issued after DHCP_DDNS attempts to submit DNS mapping
entry additions have failed. The precise reason for the failure should be
......@@ -106,16 +29,6 @@ the DHCP_DDNS process name, the second contains the PID and PID file.
This is a debug message that indicates that the application has DHCP_DDNS
requests in the queue but is working as many concurrent requests as allowed.
% DHCP_DDNS_CFG_FILE_RELOAD_ERROR configuration reload failed: %1, reverting to current configuration.
This is an error message indicating that the application attempted to reload
its configuration from file and encountered an error. This is likely due to
invalid content in the configuration file. The application should continue
to operate under its current configuration.
% DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD OS signal %1 received, reloading configuration from file: %2
This is an informational message indicating the application has received a signal
instructing it to reload its configuration from file.
% DHCP_DDNS_CLEARED_FOR_SHUTDOWN application has met shutdown criteria for shutdown type: %1
This is a debug message issued when the application has been instructed
to shutdown and has met the required criteria to exit.
......@@ -280,15 +193,6 @@ no configured DDNS domains in the DHCP_DDNS configuration. Either the DHCP_DDNS
configuration needs to be updated or the source of the FQDN itself should be
investigated.
% DHCP_DDNS_PID_FILE_ERROR %1 could not create a PID file: %2
This is an error message that occurs when DHCP_DDNS is unable to create
its PID file. The log message should contain details sufficient to
determine the underlying cause. The most likely culprits are that
some portion of the pathname does not exist or a permissions issue. The
default path is determined by --localstatedir configure parameter but
may be overridden by setting environment variable, KEA_PIDFILE_DIR. The
first argument is the DHCP_DDNS process name.
% DHCP_DDNS_PROCESS_INIT application init invoked
This is a debug message issued when the DHCP-DDNS application enters
its initialization method.
......@@ -448,33 +352,15 @@ reverse update will not performed.
This is a debug message issued when the DHCP-DDNS server exits its
event lo
% DHCP_DDNS_SHUTDOWN DHCP-DDNS has shut down
This is an informational message indicating that the DHCP-DDNS service
has shut down.
% DHCP_DDNS_SHUTDOWN_COMMAND application received shutdown command with args: %1
This is a debug message issued when the application has been instructed
to shut down by the controller.
% DHCP_DDNS_SHUTDOWN_SIGNAL_RECVD OS signal %1 received, starting shutdown
This is a debug message indicating the application has received a signal
instructing it to shutdown.
% DHCP_DDNS_SIGNAL_ERROR signal handler for signal %1, threw an unexpected exception: %2
This is an error message indicating that the application encountered an unexpected
error after receiving a signal. This is a programmatic error and should be
reported. While The application will likely continue to operating, it may be
unable to respond correctly to signals.
% DHCP_DDNS_STARTED Kea DHCP-DDNS server version %1 started
This informational message indicates that the DHCP-DDNS server has
processed all configuration information and is ready to begin processing.
The version is also printed.
% DHCP_DDNS_STARTING DHCP-DDNS starting, pid: %1, version: %2
This is an informational message issued when controller for the
service first starts. Version is also reported.
% DHCP_DDNS_STARTING_TRANSACTION Request ID %1:
This is a debug message issued when DHCP-DDNS has begun a transaction for
a given request.
......@@ -491,12 +377,6 @@ message but the attempt to send it suffered an unexpected error. This is most
likely a programmatic error, rather than a communications issue. Some or all
of the DNS updates requested as part of this request did not succeed.
% DHCP_DDNS_UNSUPPORTED_SIGNAL ignoring reception of unsupported signal: %1
This is a debug message indicating that the application received an
unsupported signal. This is a programming error indicating that the
application has registered to receive the signal but no associated
processing logic has been added.
% DHCP_DDNS_UPDATE_REQUEST_SENT Request ID %1: %2 to server: %3
This is a debug message issued when DHCP_DDNS sends a DNS request to a DNS
server.
......
src/bin/d2/d2_process.h
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -7,9 +7,9 @@
#ifndef D2_PROCESS_H
#define D2_PROCESS_H
#include <d2/d_process.h>
#include <d2/d2_queue_mgr.h>
#include <d2/d2_update_mgr.h>
#include <process/d_process.h>
namespace isc {
namespace d2 {
......
src/bin/d2/tests/Makefile.am
View file @ 91e39181
......@@ -42,26 +42,21 @@ if HAVE_GTEST
TESTS += d2_unittests
d2_unittests_SOURCES = d_test_stubs.cc d_test_stubs.h
d2_unittests_SOURCES += d2_unittests.cc
d2_unittests_SOURCES = d2_unittests.cc
d2_unittests_SOURCES += d2_process_unittests.cc
d2_unittests_SOURCES += d_cfg_mgr_unittests.cc
d2_unittests_SOURCES += d2_cfg_mgr_unittests.cc
d2_unittests_SOURCES += d2_queue_mgr_unittests.cc
d2_unittests_SOURCES += d2_update_message_unittests.cc
d2_unittests_SOURCES += d2_update_mgr_unittests.cc
d2_unittests_SOURCES += d2_zone_unittests.cc
d2_unittests_SOURCES += dns_client_unittests.cc
d2_unittests_SOURCES += io_service_signal_unittests.cc
d2_unittests_SOURCES += labeled_value_unittests.cc
d2_unittests_SOURCES += nc_add_unittests.cc
d2_unittests_SOURCES += nc_remove_unittests.cc
d2_unittests_SOURCES += nc_test_utils.cc nc_test_utils.h
d2_unittests_SOURCES += nc_trans_unittests.cc
d2_unittests_SOURCES += state_model_unittests.cc
d2_unittests_SOURCES += d2_controller_unittests.cc
d2_unittests_SOURCES += d_controller_unittests.cc
d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
d2_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
......@@ -77,7 +72,9 @@ endif
d2_unittests_LDFLAGS += $(GTEST_LDFLAGS)
d2_unittests_LDADD = $(top_builddir)/src/bin/d2/libd2.la
d2_unittests_LDADD += $(top_builddir)/src/lib/process/testutils/libprocesstest.la
d2_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
d2_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
d2_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
......
src/bin/d2/tests/d2_cfg_mgr_unittests.cc
View file @ 91e39181
......@@ -9,10 +9,10 @@
#include <config/module_spec.h>
#include <d2/d2_config.h>
#include <d2/d2_cfg_mgr.h>
#include <d_test_stubs.h>
#include <dhcpsrv/testutils/config_result_check.h>
#include <process/testutils/d_test_stubs.h>
#include <test_data_files_config.h>
#include <util/encode/base64.h>
#include <dhcpsrv/testutils/config_result_check.h>
#include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
......
src/bin/d2/tests/d2_controller_unittests.cc
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -7,10 +7,10 @@
#include <config.h>
#include <cc/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/d2_controller.h>
#include <d2/d2_process.h>
#include <d2/spec_config.h>
#include <process/spec_config.h>
#include <process/testutils/d_test_stubs.h>
#include <boost/pointer_cast.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
......@@ -232,7 +232,7 @@ TEST_F(D2ControllerTest, invalidConfigReload) {
// Context is still available post launch.
// Check to see that our configuration matches the original per
// valid_d2_config (see d_test_stubs.cc)
// valid_d2_config (see src/lib/process/testutils/d_test_stubs.cc)
D2CfgMgrPtr d2_cfg_mgr = getD2CfgMgr();
D2ParamsPtr d2_params = d2_cfg_mgr->getD2Params();
ASSERT_TRUE(d2_params);
......
src/bin/d2/tests/d2_process_tests.sh.in
View file @ 91e39181
......@@ -115,7 +115,7 @@ dynamic_reconfiguration_test() {
send_signal 1 ${bin}
# Wait up to 10s for the D2Controller to log reload signal received.
wait_for_message 10 "DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD" 1
wait_for_message 10 "DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD" 1
if [ ${_WAIT_FOR_MESSAGE} -eq 0 ]; then
printf "ERROR: D2 did report the reload signal receipt.\n"
clean_exit 1
......@@ -124,7 +124,7 @@ dynamic_reconfiguration_test() {
# After receiving SIGHUP the server should try to reconfigure itself.
# The configuration provided is invalid so it should result in
# reconfiguration failure but the server should still be running.
wait_for_message 10 "DHCP_DDNS_CFG_FILE_RELOAD_ERROR" 1
wait_for_message 10 "DCTL_CFG_FILE_RELOAD_ERROR" 1
if [ ${_WAIT_FOR_MESSAGE} -eq 0 ]; then
printf "ERROR: D2 did not report reload error.\n"
clean_exit 1
......@@ -213,7 +213,7 @@ shutdown_test() {
send_signal ${signum} ${bin}
# Now wait for process to log that it is exiting.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
if [ ${_WAIT_FOR_MESSAGE} -eq 0 ]; then
printf "ERROR: DHCP-DDNS did not log shutdown.\n"
clean_exit 1
......@@ -227,7 +227,7 @@ shutdown_test() {
test_finish 0
}
server_pid_file_test "${CONFIG}" DHCP_DDNS_ALREADY_RUNNING
server_pid_file_test "${CONFIG}" DCTL_ALREADY_RUNNING
dynamic_reconfiguration_test
shutdown_test "dhcp-ddns.sigterm_test" 15
shutdown_test "dhcp-ddns.sigint_test" 2
......
src/bin/d2/tests/d2_process_unittests.cc
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -10,7 +10,7 @@
#include <cc/command_interpreter.h>
#include <d2/d2_process.h>
#include <dhcp_ddns/ncr_io.h>
#include <d_test_stubs.h>
#include <process/testutils/d_test_stubs.h>
#include <boost/bind.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
......
src/bin/d2/tests/d2_update_mgr_unittests.cc
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -8,9 +8,9 @@
#include <asiolink/io_service.h>
#include <d2/d2_update_mgr.h>
#include <util/time_utilities.h>
#include <d_test_stubs.h>
#include <nc_test_utils.h>
#include <process/testutils/d_test_stubs.h>
#include <util/time_utilities.h>
#include <boost/function.hpp>
#include <boost/bind.hpp>
......
src/bin/keactrl/tests/keactrl_tests.sh.in
View file @ 91e39181
......@@ -211,7 +211,7 @@ Expected wait_for_message return %d, returned %d."
Expected wait_for_message return %d, returned %d."
# Wait up to 10s for the D2 server to stop.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
assert_eq 1 ${_WAIT_FOR_MESSAGE} \
"Timeout waiting for ${d2_name} to shutdown. \
Expected wait_for_message return %d, returned %d."
......@@ -315,7 +315,7 @@ Expected wait_for_message return %d, returned %d."
Expected wait_for_message return %d, returned %d."
# Wait up to 10s for the D2 server to stop.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
assert_eq 1 ${_WAIT_FOR_MESSAGE} \
"Timeout waiting for ${d2_name} to shutdown. \
Expected wait_for_message return %d, returned %d."
......@@ -627,7 +627,7 @@ Expected wait_for_message return %d, returned %d."
Expected wait_for_message return %d, returned %d."
# Wait up to 10s for the D2 server to stop.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
assert_eq 1 ${_WAIT_FOR_MESSAGE} \
"Timeout waiting for ${d2_name} to shutdown. \
Expected wait_for_message return %d, returned %d."
......@@ -781,7 +781,7 @@ Expected wait_for_message return %d, returned %d."
Expected wait_for_message return %d, returned %d."
# Wait up to 10s for the d2 server to stop.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
assert_eq 1 ${_WAIT_FOR_MESSAGE} \
"Timeout waiting for ${d2_name} to shutdown. \
Expected wait_for_message return %d, returned %d."
......@@ -920,7 +920,7 @@ Expected wait_for_message return %d, returned %d."
assert_eq 0 ${ret} "Expected keactrl to return %d, returned value was %d."
# Wait up to 10s for the D2 server to stop.
wait_for_message 10 "DHCP_DDNS_SHUTDOWN" 1
wait_for_message 10 "DCTL_SHUTDOWN" 1
assert_eq 1 ${_WAIT_FOR_MESSAGE} \
"Timeout waiting for ${d2_name} to shutdown. \
Expected wait_for_message return %d, returned %d."
......
src/lib/Makefile.am
View file @ 91e39181
# The following build order must be maintained.
SUBDIRS = exceptions util log cryptolink dns cc hooks asiolink testutils dhcp config \
stats asiodns dhcp_ddns eval dhcpsrv cfgrpt
stats asiodns dhcp_ddns eval dhcpsrv cfgrpt process
src/lib/process/.gitignore 0 → 100644
View file @ 91e39181
/process_messages.cc
/process_messages.h
/spec_config.h
/spec_config.h.pre
/s-messages
src/lib/process/Makefile.am 0 → 100644
View file @ 91e39181
SUBDIRS = . testutils tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
if HAVE_MYSQL
AM_CPPFLAGS += $(MYSQL_CPPFLAGS)
endif
if HAVE_PGSQL
AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
endif
if HAVE_CQL
AM_CPPFLAGS += $(CQL_CPPFLAGS)
endif
AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Define rule to build logging source files from message file
process_messages.h process_messages.cc: s-messages
s-messages: process_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/process/process_messages.mes
touch $@
spec_config.h: spec_config.h.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
# Tell automake that the message files are built as part of the build process
# (so that they are built before the main library is built).
BUILT_SOURCES = spec_config.h process_messages.h process_messages.cc
# Ensure that the message file is included in the distribution
EXTRA_DIST = process_messages.mes
# Get rid of generated message files on a clean
CLEANFILES = *.gcno *.gcda spec_config.h process_messages.h process_messages.cc s-messages
lib_LTLIBRARIES = libkea-process.la
libkea_process_la_SOURCES = d2_log.cc d2_log.h
libkea_process_la_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
libkea_process_la_SOURCES += d_controller.cc d_controller.h
libkea_process_la_SOURCES += d_process.h
libkea_process_la_SOURCES += io_service_signal.cc io_service_signal.h
nodist_libkea_process_la_SOURCES = process_messages.cc process_messages.h
libkea_process_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_process_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_process_la_LDFLAGS = $(AM_LDFLAGS)
libkea_process_la_LDFLAGS += -no-undefined -version-info 1:0:0
libkea_process_la_LIBADD =
libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
libkea_process_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
libkea_process_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
# Specify the headers for copying into the installation directory tree.
libkea_process_includedir = $(pkgincludedir)/process
libkea_process_include_HEADERS = \
d2_log.h \
d_cfg_mgr.h \
d_controller.h \
d_process.h \
io_service_signal.h
src/lib/process/d2_log.cc 0 → 100644
View file @ 91e39181
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
/// Defines the logger used by the top-level component of kea-dhcp-ddns.
#include <process/d2_log.h>
namespace isc {
namespace d2 {
/// @brief Defines the logger used within libkea-process library.
isc::log::Logger dctl_logger("dhcpddns");
} // namespace d2
} // namespace isc
src/lib/process/d2_log.h 0 → 100644
View file @ 91e39181
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#ifndef D2_LOG_H
#define D2_LOG_H
#include <log/logger_support.h>
#include <log/macros.h>
#include <process/process_messages.h>
namespace isc {
namespace d2 {
/// Define the loggers used within libkea-process library.
extern isc::log::Logger dctl_logger;
} // namespace d2
} // namespace isc
#endif // D2_LOG_H
src/bin/d2/d_cfg_mgr.cc → src/lib/process/d_cfg_mgr.cc
View file @ 91e39181
// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public