From adbc2074de4bc49429e34f5772595a172e63fc2b Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 9 Feb 2016 11:10:09 +0200 Subject: [PATCH] Remove log_manager as a separate component. Log_manager files are now in server/core and the log manager test files in server/core/test. The directory log_manager is removed. --- CMakeLists.txt | 1 - log_manager/CMakeLists.txt | 12 ------------ log_manager/test/.gitignore | 2 -- log_manager/test/CMakeLists.txt | 6 ------ server/core/CMakeLists.txt | 2 +- {log_manager => server/core}/log_manager.cc | 0 server/core/test/CMakeLists.txt | 6 ++++++ {log_manager => server/core}/test/logorder.sh | 0 {log_manager => server/core}/test/testlog.c | 0 .../testorder.c => server/core/test/testlogorder.c | 0 {log_manager => server/include}/log_manager.h | 0 11 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 log_manager/CMakeLists.txt delete mode 100644 log_manager/test/.gitignore delete mode 100644 log_manager/test/CMakeLists.txt rename {log_manager => server/core}/log_manager.cc (100%) rename {log_manager => server/core}/test/logorder.sh (100%) rename {log_manager => server/core}/test/testlog.c (100%) rename log_manager/test/testorder.c => server/core/test/testlogorder.c (100%) rename {log_manager => server/include}/log_manager.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eac3af265..005abf5ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb") include_directories(utils) -include_directories(log_manager) include_directories(server/include) include_directories(server/include/maxscale) include_directories(server/inih) diff --git a/log_manager/CMakeLists.txt b/log_manager/CMakeLists.txt deleted file mode 100644 index 4a5e53970..000000000 --- a/log_manager/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# NOTE: This is currently not used. log_manager.cc is built directly into maxscale-common. -# To be removed completely. -if(LOG_DEBUG) - add_definitions(-DSS_LOG_DEBUG) -endif() -add_library(log_manager SHARED log_manager.cc) -target_link_libraries(log_manager pthread aio stdc++) -set_target_properties(log_manager PROPERTIES VERSION "1.0.0") -install(TARGETS log_manager DESTINATION ${MAXSCALE_LIBDIR}) -if(BUILD_TESTS) - add_subdirectory(test) -endif() diff --git a/log_manager/test/.gitignore b/log_manager/test/.gitignore deleted file mode 100644 index c6172ea0a..000000000 --- a/log_manager/test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# binaries generated here -testlog diff --git a/log_manager/test/CMakeLists.txt b/log_manager/test/CMakeLists.txt deleted file mode 100644 index e485e747e..000000000 --- a/log_manager/test/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_executable(testlog testlog.c) -add_executable(testorder testorder.c ../../server/core/random_jkiss.c) -target_link_libraries(testlog pthread log_manager utils fullcore) -target_link_libraries(testorder pthread log_manager utils fullcore) -add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log) -add_test(Internal-TestLog testlog) diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 3aaec05cc..ea733556d 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(maxscale-common SHARED adminusers.c atomic.c buffer.c config.c dbusers.c dcb.c filter.c externcmd.c gwbitmask.c gwdirs.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c maxscale_pcre2.c memlog.c modutil.c monitor.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c ${CMAKE_SOURCE_DIR}/log_manager/log_manager.cc ${CMAKE_SOURCE_DIR}/utils/skygw_utils.cc statistics.c) +add_library(maxscale-common SHARED adminusers.c atomic.c buffer.c config.c dbusers.c dcb.c filter.c externcmd.c gwbitmask.c gwdirs.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c memlog.c modutil.c monitor.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c ${CMAKE_SOURCE_DIR}/utils/skygw_utils.cc statistics.c) target_link_libraries(maxscale-common ${MARIADB_CONNECTOR_LIBRARIES} ${LZMA_LINK_FLAGS} ${PCRE2_LIBRARIES} ${CURL_LIBRARIES} ssl aio pthread crypt dl crypto inih z rt m stdc++) diff --git a/log_manager/log_manager.cc b/server/core/log_manager.cc similarity index 100% rename from log_manager/log_manager.cc rename to server/core/log_manager.cc diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt index 36d32f960..400974027 100644 --- a/server/core/test/CMakeLists.txt +++ b/server/core/test/CMakeLists.txt @@ -5,6 +5,8 @@ add_executable(test_dcb testdcb.c) add_executable(test_filter testfilter.c) add_executable(test_hash testhash.c) add_executable(test_hint testhint.c) +add_executable(test_log testlog.c) +add_executable(test_logorder testlogorder.c) add_executable(test_modutil testmodutil.c) add_executable(test_mysql_users test_mysql_users.c) add_executable(test_poll testpoll.c) @@ -21,6 +23,8 @@ target_link_libraries(test_dcb maxscale-common) target_link_libraries(test_filter maxscale-common) target_link_libraries(test_hash maxscale-common) target_link_libraries(test_hint maxscale-common) +target_link_libraries(test_log maxscale-common) +target_link_libraries(test_logorder maxscale-common) target_link_libraries(test_modutil maxscale-common) target_link_libraries(test_mysql_users MySQLClient maxscale-common) target_link_libraries(test_poll maxscale-common) @@ -37,6 +41,8 @@ add_test(Internal-TestDCB test_dcb) add_test(Internal-TestFilter test_filter) add_test(Internal-TestHash test_hash) add_test(Internal-TestHint test_hint) +add_test(Internal-TestLog test_log) +add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log) add_test(Internal-TestMaxScalePCRE2 testmaxscalepcre2) add_test(Internal-TestMemlog testmemlog) add_test(Internal-TestModutil test_modutil) diff --git a/log_manager/test/logorder.sh b/server/core/test/logorder.sh similarity index 100% rename from log_manager/test/logorder.sh rename to server/core/test/logorder.sh diff --git a/log_manager/test/testlog.c b/server/core/test/testlog.c similarity index 100% rename from log_manager/test/testlog.c rename to server/core/test/testlog.c diff --git a/log_manager/test/testorder.c b/server/core/test/testlogorder.c similarity index 100% rename from log_manager/test/testorder.c rename to server/core/test/testlogorder.c diff --git a/log_manager/log_manager.h b/server/include/log_manager.h similarity index 100% rename from log_manager/log_manager.h rename to server/include/log_manager.h