From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 29 Aug 2018 18:28:51 +0000 (+0200)
Subject: [#25,!14] Moved daemon.cc|h, unittests to process
X-Git-Tag: gitlab116_base~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0976de24882129cbd6b777dfb72ade6f5ebd5ae;p=thirdparty%2Fkea.git

[#25,!14] Moved daemon.cc|h, unittests to process
---

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index b6f42d97bf..7e743aa2a5 100644
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -114,7 +114,9 @@ libkea_dhcpsrv_la_SOURCES += csv_lease_file4.cc csv_lease_file4.h
 libkea_dhcpsrv_la_SOURCES += csv_lease_file6.cc csv_lease_file6.h
 libkea_dhcpsrv_la_SOURCES += d2_client_cfg.cc d2_client_cfg.h
 libkea_dhcpsrv_la_SOURCES += d2_client_mgr.cc d2_client_mgr.h
-libkea_dhcpsrv_la_SOURCES += daemon.cc daemon.h
+libkea_dhcpsrv_la_SOURCES += database_connection.cc database_connection.h
+libkea_dhcpsrv_la_SOURCES += db_exceptions.h
+libkea_dhcpsrv_la_SOURCES += db_log.cc db_log.h
 libkea_dhcpsrv_la_SOURCES += db_type.h
 libkea_dhcpsrv_la_SOURCES += dhcp4o6_ipc.cc dhcp4o6_ipc.h
 libkea_dhcpsrv_la_SOURCES += dhcpsrv_exceptions.h
@@ -201,6 +203,7 @@ libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_dhcpsrv_la_LIBADD  = $(top_builddir)/src/lib/eval/libkea-eval.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+#libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/process/libkea-process.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/stats/libkea-stats.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libkea_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
@@ -279,7 +282,9 @@ libkea_dhcpsrv_include_HEADERS = \
 	dhcpsrv_exceptions.h \
 	d2_client_cfg.h \
 	d2_client_mgr.h \
-	daemon.h \
+	database_connection.h \
+	db_exceptions.h \
+	db_log.h \
 	db_type.h \
 	dhcp4o6_ipc.h \
 	host.h \
diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 696ebcf6eb..8510186969 100644
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -84,7 +84,8 @@ libdhcpsrv_unittests_SOURCES += csv_lease_file4_unittest.cc
 libdhcpsrv_unittests_SOURCES += csv_lease_file6_unittest.cc
 libdhcpsrv_unittests_SOURCES += d2_client_unittest.cc
 libdhcpsrv_unittests_SOURCES += d2_udp_unittest.cc
-libdhcpsrv_unittests_SOURCES += daemon_unittest.cc
+libdhcpsrv_unittests_SOURCES += database_connection_unittest.cc
+libdhcpsrv_unittests_SOURCES += dbaccess_parser_unittest.cc
 libdhcpsrv_unittests_SOURCES += dhcp4o6_ipc_unittest.cc
 libdhcpsrv_unittests_SOURCES += duid_config_parser_unittest.cc
 libdhcpsrv_unittests_SOURCES += expiration_config_parser_unittest.cc
diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am
index c5846de440..b65b05c962 100644
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = . testutils tests
 
 AM_CPPFLAGS  = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += -DDATA_DIR="\"$(dhcp_data_dir)\""
+
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 if HAVE_MYSQL
@@ -40,6 +42,7 @@ 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_log.cc d_log.h
 libkea_process_la_SOURCES += d_process.h
+libkea_process_la_SOURCES += daemon.cc daemon.h
 libkea_process_la_SOURCES += io_service_signal.cc io_service_signal.h
 
 nodist_libkea_process_la_SOURCES = process_messages.cc process_messages.h
diff --git a/src/lib/dhcpsrv/daemon.cc b/src/lib/process/daemon.cc
similarity index 100%
rename from src/lib/dhcpsrv/daemon.cc
rename to src/lib/process/daemon.cc
diff --git a/src/lib/dhcpsrv/daemon.h b/src/lib/process/daemon.h
similarity index 100%
rename from src/lib/dhcpsrv/daemon.h
rename to src/lib/process/daemon.h
diff --git a/src/lib/process/tests/Makefile.am b/src/lib/process/tests/Makefile.am
index 00dcc6c981..28833698e1 100644
--- a/src/lib/process/tests/Makefile.am
+++ b/src/lib/process/tests/Makefile.am
@@ -22,6 +22,7 @@ TESTS += libprocess_unittests
 
 libprocess_unittests_SOURCES  = d_cfg_mgr_unittests.cc
 libprocess_unittests_SOURCES += d_controller_unittests.cc
+libprocess_unittests_SOURCES += daemon_unittest.cc
 libprocess_unittests_SOURCES += io_service_signal_unittests.cc
 libprocess_unittests_SOURCES += run_unittests.cc
 
diff --git a/src/lib/dhcpsrv/tests/daemon_unittest.cc b/src/lib/process/tests/daemon_unittest.cc
similarity index 100%
rename from src/lib/dhcpsrv/tests/daemon_unittest.cc
rename to src/lib/process/tests/daemon_unittest.cc